From a4a28db18993e2ffead41c34184345ad240a1a80 Mon Sep 17 00:00:00 2001
From: jl7719 <jl7719@imperial.ac.uk>
Date: Fri, 18 Dec 2020 10:41:01 +0000
Subject: [PATCH] Add stderr.txt files and diff.txt files for debugging

---
 .gitignore                    | 2 ++
 test/test_mips_cpu_bus.sh     | 8 ++++----
 test/test_mips_cpu_harvard.sh | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 15145de..1ab9eb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ mips_cpu_harvard.vcd
 mips_cpu_bus.vcd
 .DS_Store
 inputs/.DS_Store
+*.stderr.txt
+*.diff.txt
\ No newline at end of file
diff --git a/test/test_mips_cpu_bus.sh b/test/test_mips_cpu_bus.sh
index 17c1dde..1c7629f 100755
--- a/test/test_mips_cpu_bus.sh
+++ b/test/test_mips_cpu_bus.sh
@@ -26,10 +26,10 @@ then
                 -P mips_cpu_bus_tb.INSTR_INIT_FILE=\"inputs/${DIR}/${TESTCASE}.txt\" \
                 -P mips_cpu_bus_tb.DATA_INIT_FILE=\"inputs/${DIR}/${TESTCASE}.data.txt\" \
                 -o exec/mips_cpu_bus_tb_${TESTCASE} testbench/mips_cpu_bus_tb.v testbench/mips_cpu_bus_memory.v \
-                ${SRC} 2> /dev/null
+                ${SRC} 2> inputs/${DIR}/${TESTCASE}.stderr.txt
             ./exec/mips_cpu_bus_tb_${TESTCASE} &> ./inputs/${DIR}/${TESTCASE}.log.txt;             # log file for debugging (contains $display)
             echo "$(tail -1 ./inputs/${DIR}/${TESTCASE}.log.txt)" > ./inputs/${DIR}/${TESTCASE}.out.txt;      # register v0 output to compare with reference
-            if diff -w ./inputs/${DIR}/${TESTCASE}.out.txt ./inputs/${DIR}/${TESTCASE}.ref.txt &> /dev/null   # compare
+            if diff -w ./inputs/${DIR}/${TESTCASE}.out.txt ./inputs/${DIR}/${TESTCASE}.ref.txt &> inputs/${DIR}/${TESTCASE}.diff.txt  # compare
             then 
                 echo ${TESTCASE} ${DIR} "Pass";
             else 
@@ -47,10 +47,10 @@ else
         -P mips_cpu_bus_tb.INSTR_INIT_FILE=\"inputs/${INSTR}/${TESTCASE}.txt\" \
         -P mips_cpu_bus_tb.DATA_INIT_FILE=\"inputs/${INSTR}/${TESTCASE}.data.txt\" \
         -o exec/mips_cpu_bus_tb_${TESTCASE} testbench/mips_cpu_bus_tb.v testbench/mips_cpu_bus_memory.v \
-        ${SRC} 2> /dev/null
+        ${SRC} 2> inputs/${INSTR}/${TESTCASE}.stderr.txt
         ./exec/mips_cpu_bus_tb_${TESTCASE} &> ./inputs/${INSTR}/${TESTCASE}.log.txt;             # log file for debugging (contains $display)
         echo "$(tail -1 ./inputs/${INSTR}/${TESTCASE}.log.txt)" > ./inputs/${INSTR}/${TESTCASE}.out.txt;      # register v0 output to compare with reference
-        if diff -w ./inputs/${INSTR}/${TESTCASE}.out.txt ./inputs/${INSTR}/${TESTCASE}.ref.txt &> /dev/null   # compare
+        if diff -w ./inputs/${INSTR}/${TESTCASE}.out.txt ./inputs/${INSTR}/${TESTCASE}.ref.txt &> inputs/${INSTR}/${TESTCASE}.diff.txt   # compare
         then 
             echo ${TESTCASE} ${INSTR} "Pass";
         else 
diff --git a/test/test_mips_cpu_harvard.sh b/test/test_mips_cpu_harvard.sh
index 1d1ffd2..2c3a57d 100755
--- a/test/test_mips_cpu_harvard.sh
+++ b/test/test_mips_cpu_harvard.sh
@@ -26,10 +26,10 @@ then
                 -P mips_cpu_harvard_tb.INSTR_INIT_FILE=\"inputs/${DIR}/${TESTCASE}.txt\" \
                 -P mips_cpu_harvard_tb.DATA_INIT_FILE=\"inputs/${DIR}/${TESTCASE}.data.txt\" \
                 -o exec/mips_cpu_harvard_tb_${TESTCASE} testbench/mips_cpu_harvard_tb.v testbench/mips_cpu_harvard_memory.v\
-                ${SRC} 2> /dev/null
+                ${SRC} 2> inputs/${DIR}/${TESTCASE}.stderr.txt
             ./exec/mips_cpu_harvard_tb_${TESTCASE} &> ./inputs/${DIR}/${TESTCASE}.log.txt;             # log file for debugging (contains $display)
             echo "$(tail -1 ./inputs/${DIR}/${TESTCASE}.log.txt)" > ./inputs/${DIR}/${TESTCASE}.out.txt;      # register v0 output to compare with reference
-            if diff -w ./inputs/${DIR}/${TESTCASE}.out.txt ./inputs/${DIR}/${TESTCASE}.ref.txt &> /dev/null   # compare
+            if diff -w ./inputs/${DIR}/${TESTCASE}.out.txt ./inputs/${DIR}/${TESTCASE}.ref.txt &> inputs/${DIR}/${TESTCASE}.diff.txt   # compare
             then 
                 echo ${TESTCASE} ${DIR} "Pass";
             else 
@@ -47,10 +47,10 @@ else
         -P mips_cpu_harvard_tb.INSTR_INIT_FILE=\"inputs/${INSTR}/${TESTCASE}.txt\" \
         -P mips_cpu_harvard_tb.DATA_INIT_FILE=\"inputs/${INSTR}/${TESTCASE}.data.txt\" \
         -o exec/mips_cpu_harvard_tb_${TESTCASE} testbench/mips_cpu_harvard_tb.v testbench/mips_cpu_harvard_memory.v\
-        ${SRC} 2> /dev/null
+        ${SRC} 2> inputs/${INSTR}/${TESTCASE}.stderr.txt
         ./exec/mips_cpu_harvard_tb_${TESTCASE} &> ./inputs/${INSTR}/${TESTCASE}.log.txt;             # log file for debugging (contains $display)
         echo "$(tail -1 ./inputs/${INSTR}/${TESTCASE}.log.txt)" > ./inputs/${INSTR}/${TESTCASE}.out.txt;      # register v0 output to compare with reference
-        if diff -w ./inputs/${INSTR}/${TESTCASE}.out.txt ./inputs/${INSTR}/${TESTCASE}.ref.txt &> /dev/null   # compare
+        if diff -w ./inputs/${INSTR}/${TESTCASE}.out.txt ./inputs/${INSTR}/${TESTCASE}.ref.txt &> inputs/${INSTR}/${TESTCASE}.diff.txt   # compare
         then 
             echo ${TESTCASE} ${INSTR} "Pass";
         else