update tabel en make

diff --git a/a2/1cases.tex b/a2/1cases.tex
index 47f7acf..da3a34b 100644 (file)
--- a/a2/1cases.tex
+++ b/a2/1cases.tex
@@ -7,65 +7,66 @@ are to be run in a terminal. Commands prefixed with a \texttt{\#} should be run
 with root permissions. Commands prefixed with a \texttt{\$} should be run with
 user permissions.
 
-\begin{longtable}{|p{.2\linewidth}|p{.8\linewidth}|}
+\begin{longtable}{|l|rp{.8\linewidth}|}
        \hline
-       Check 1 & Get the SUT in a workable state.\\
+       Check 1 & \multicolumn{2}{l|}{Get the SUT in a workable state.}\\
        \hline
        \multirow{3}{*}{Course of action} 
-               & 1. Import the VirtualBox image into VirtualBox.\\
-               & 2. Boot the vm.\\
-               & 3. Verify the SUT booted successfully and the network modules are
+               & 1. & Import the VirtualBox image into VirtualBox.\\
+               & 2. & Boot the vm.\\
+               & 3. & Verify the SUT booted successfully and the network modules are
                loaded.\\
        \hline
-       Passed & \textit{Yes/No} \\
+       Passed & \multicolumn{2}{l|}{\textit{Yes/No}}\\
        \hline\hline
-       Check 2 & Verify the SUT is complete. \\
+       Check 2 & \multicolumn{2}{l|}{Verify the SUT is complete.}\\
        \hline
        \multirow{5}{*}{Course of action}
-               & 1. Boot the SUT as in \emph{Check 1}.\\
-               & 2. Verify the loopback device exists by running 
-                       \texttt{\$ ifconfig}.\\
-               & 3. Verify the \emph{echo-server} is present on the system by running
+               & 1. & Boot the SUT as in \emph{Check 1}.\\
+               & 2. & Verify the loopback device exists by running 
+                        \texttt{\$ ifconfig}.\\
+               & 3. & Verify the \emph{echo-server} is present on the system by running
                        \texttt{\$ file code/server/Main.java}\\
-               & 4. Verify \emph{Scapy} is present on the system by running
+               & 4. & Verify \emph{Scapy} is present on the system by running
                        \texttt{\$ scapy}.\\
-               & 5. Verify all scripts used for testing are present on the system.\\
+               & 5. & Verify all scripts used for testing are present on the system.\\
        \hline
-       Passed & \textit{Yes/No}\\
+       Passed & \multicolumn{2}{l|}{\textit{Yes/No}}\\
        \hline\hline
-       Check 3 & Initialize the testing environment.\\
+       Check 3 & \multicolumn{2}{l|}{Initialize the testing environment..}\\
        \hline
        \multirow{5}{*}{Course of action}
-               & 1. Boot the SUT as in \emph{Check 1}.\\
-               & 2. Setup iptables by executing
+               & 1. & Boot the SUT as in \emph{Check 1}.\\
+               & 2. & Setup iptables by executing
                        \texttt{\# code/iptables.sh}~\footnote{The IPTables script ensures
                        that the OS does not drop packets due to an the unknown source.}\\
-               & 3. Navigate to the working directory by running
+               & 3. & Navigate to the working directory by running
                        \texttt{\$ cd /home/student/tt2015}\\
-               & Compile the echo server by running 
+               & 4. & Compile the echo server by running 
                        \texttt{\# cd code/server \&\& make \&\& cd -}\\
-               & Start the echo server by running
+               & 5. & Start the echo server by running
                        \texttt{\# cd code/server \&\& java Main}\\
        \hline
-       Passed & \textit{Yes/No}\\
+       Passed & \multicolumn{2}{l|}{\textit{Yes/No}}\\
        \hline\hline
-       Check 4 & Test the tool environment.\\
+       Check 4 & \multicolumn{2}{l|}{Test the tool environment.}\\
        \hline
        \multirow{3}{*}{Course of action}
-               & 1. Initialize the SUT as in \emph{Check 3}\\
-               & 2. Execute the test script by running
+               & 1. & Initialize the SUT as in \emph{Check 3}\\
+               & 2. & Execute the test script by running
                        \texttt{\# code/client/helloworld.py}\\
-               & 3. Verify the console displays a success message.\\
+               & 3. & Verify the console displays a success message.\\
        \hline
-       Passed & \textit{Yes/No}\\
+       Passed & \multicolumn{2}{l|}{\textit{Yes/No}}\\
        \hline\hline
-       Check 5 & All test inputs and scripts are present.\\\hline
+       Check 5 & \multicolumn{2}{l|}{All test inputs and scripts are present.}\\
+       \hline
        \multirow{2}{*}{Course of action}
-               & 1. Boot the SUT as in \emph{Check 1}.\\
-               & 2. Verify that the test generation script is present by running
+               & 1. & Boot the SUT as in \emph{Check 1}.\\
+               & 2. & Verify that the test generation script is present by running
                        \texttt{\$ file code/client/test.py}\\
        \hline
-       Passed & \textit{Yes/No}\\
+       Passed & \multicolumn{2}{l|}{\textit{Yes/No}}\\
        \hline
        \caption{Preflight checklist\label{tbl:preflight}}
 \end{longtable}

diff --git a/a2/Makefile b/a2/Makefile
index b1820ed..fd0984a 100644 (file)
--- a/a2/Makefile
+++ b/a2/Makefile
@@ -12,10 +12,10 @@ all: $(DOCUMENT).pdf
        dvipdfm $<
 
 %.dvi: %.tex %.fmt $(SOURCES)
-       $(LATEX) --shell-escape $(basename $@)
+       $(LATEX) $(basename $@)
        bibtex $(basename $@)
-       $(LATEX) -shell-escape $(basename $@)
-       $(LATEX) -shell-escape $(basename $@)
+       $(LATEX) $(basename $@)
+       $(LATEX) $(basename $@)
 
 %.fmt: preamble.tex
        $(LATEX) -ini -jobname="$(basename $@)" "&$(LATEX) $<\dump"