Changeset 1c31f68

Timestamp:

Jun 15, 2016, 4:13:18 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

a725c99

Parents:

efc15918

Message:

refactored tests to new python script

Location:

src/tests

Files:

• .expect/avl_test.txt (added)
• .expect/vector_test.txt (added)
• Makefile.am (modified) (1 diff)
• runTests.sh (modified) (1 diff)
• test.py (modified) (1 diff)
• vector/array.c (moved) (moved from src/tests/array.c)
• vector/array.h (moved) (moved from src/tests/array.h)
• vector/vector_int.c (moved) (moved from src/tests/vector_int.c)
• vector/vector_int.h (moved) (moved from src/tests/vector_int.h)
• vector/vector_test.c (moved) (moved from src/tests/vector_test.c)

src/tests/Makefile.am

@@ -21 +21 @@
 noinst_PROGRAMS = fstream_test vector_test avl_test # build but do not install
 fstream_test_SOURCES = fstream_test.c
-vector_test_SOURCES = vector_int.c array.c vector_test.c
+vector_test_SOURCES = vector/vector_int.c vector/array.c vector/vector_test.c
 avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c

src/tests/runTests.sh

@@ -26 +26 @@
 # current directory named the same; should also be an input file
 # tests/$test.in.txt and expected output tests/$test.out.txt
+# tests="vector_test avl_test"
+#
+# # log file for test output;
+# # reset at the beginning of each run
+# logfile=tests/log.txt
+# touch $logfile && rm $logfile
+#
+# # clean existing build artifacts before run
+# make clean > /dev/null 2>&1
+#
+# ret_val=0
+#
+# for test in $tests; do
+#       echo -n "    $test" | tee -a $logfile
+#
+#       # build, skipping to next test on error
+#       if ! make -j 8 $test > tests/$test.make.txt 2>&1; then
+#               ret_val=1
+#               echo -e "\tFAILED with build error:" | tee -a $logfile
+#               cat tests/$test.make.txt | tee -a $logfile
+#               continue
+#       fi
+#       rm tests/$test.make.txt
+#
+#       # run, testing against expected output
+#       ./$test < tests/$test.in.txt > tests/$test.run.txt 2>&1
+#       if ! diff tests/$test.out.txt tests/$test.run.txt > tests/$test.diff.txt; then
+#               ret_val=1
+#               echo -e "\tFAILED with output mismatch:" | tee -a $logfile
+#               cat tests/$test.diff.txt | tee -a $logfile
+#               continue
+#       fi
+#       rm tests/$test.run.txt tests/$test.diff.txt ./$test
+#
+#       echo -e "\tPASSED" | tee -a $logfile
+# done
+#
+# exit $((ret_val))
+
 tests="vector_test avl_test"
 
-# log file for test output;
-# reset at the beginning of each run
-logfile=tests/log.txt
-touch $logfile && rm $logfile
-
-# clean existing build artifacts before run
-make clean > /dev/null 2>&1
+python test.py ${tests}
 
 ret_val=0
-
-for test in $tests; do
-        echo -n "    $test" | tee -a $logfile
-
-        # build, skipping to next test on error
-        if ! make -j 8 $test > tests/$test.make.txt 2>&1; then
-                ret_val=1
-                echo -e "\tFAILED with build error:" | tee -a $logfile
-                cat tests/$test.make.txt | tee -a $logfile
-                continue
-        fi
-        rm tests/$test.make.txt
-
-        # run, testing against expected output
-        ./$test < tests/$test.in.txt > tests/$test.run.txt 2>&1
-        if ! diff tests/$test.out.txt tests/$test.run.txt > tests/$test.diff.txt; then
-                ret_val=1
-                echo -e "\tFAILED with output mismatch:" | tee -a $logfile
-                cat tests/$test.diff.txt | tee -a $logfile
-                continue
-        fi
-        rm tests/$test.run.txt tests/$test.diff.txt ./$test
-
-        echo -e "\tPASSED" | tee -a $logfile
-done
-
 exit $((ret_val))

src/tests/test.py

@@ -133 +133 @@
                 sys.exit(1)
 
-        unkownTests = False
-        for test in options.tests :
-                if not (test in tests) :
-                        print("ERROR: unkown test %s" % test)
-                        unkownTests = true
-
-        if unkownTests :
-                sys.exit(1)
-
         if options.generate_expected :
                 generate_expect( options.tests )