add support for chapter and variant

Author: arsalan0c

scripts/test.sh

@@ -5,6 +5,9 @@ JS_SLANG="node node_modules/js-slang/dist/repl/repl.js"
 SOURCEFILES=src/*/*.js
 SOURCE_TEST="src/test/framework/main.js"
 
+DEFAULT_CHAP=4
+DEFAULT_VARIANT="default"
+
 red=`tput setaf 1`
 green=`tput setaf 2`
 normal=`tput setaf 7`
@@ -14,11 +17,14 @@ failed=0
 
 # $1 is the source file to be tested
 # $2 is the test file
+# $3 is the chapter
+# $4 is the variant
+
 test_source() {
 
     # run concatenation of source and test case
     # compare the result with the commented last line in test case
-    DIFF=$(diff <($JS_SLANG -e --chapter=4 "$(cat $1 $2)") \
+    DIFF=$(diff <($JS_SLANG -e --chapter=$3 --variant=$4 "$(cat $1 $2)") \
 		<(cat $2 | tail -1 | cut -c4-))
 
     if [ "$DIFF" = "" ]
@@ -29,18 +35,17 @@ $DIFF"
 
 }
 
-# $1 is the source file to be tested
-# $2 is the Source test file which uses the source-test framework
 test_source_framework() {
+
     # run concatenation of source-test framework, source and test files
-    RESULTS=$($JS_SLANG -e --chapter=4 "$(cat $SOURCE_TEST $1 $2)")
+    RESULTS=$($JS_SLANG -e --chapter=$3 --variant=$4 "$(cat $SOURCE_TEST $1 $2)")
 
     # retrieve names for tests that passed
     while read test_name
     do 
         passed=$(($passed+1))
         echo "${green}PASS $2 $test_name"
-    done < <(echo ${RESULTS} | grep -o '\w* PASSED' | awk -F 'PASSED' '{print $1}')
+    done < <(echo ${RESULTS} | grep -o '\w* PASSED' | awk -F 'PASSED' '{ print $1 }')
 
     # retrieve names and error messages for tests that failed
     while read test_info 
@@ -64,11 +69,17 @@ main() {
 	    # call test_source on each test case in __tests__
 	    for i in "$DIR/__tests__/$(basename ${s} .js)".*
 	    do
-            # check if first line of test file contains '// source-test'
-            use_source_test=$(awk 'FNR==1{if ($0~"//[[:space:]]*source-test") print "yes";}' $i)
+            # check if first line of test file contains 'chap=' and retrieve its value. Set to the default chapter if it does not
+            chap=$(awk -F 'chap=' 'FNR==1{ if ($0~"chap=") { print $2 } else { print '$DEFAULT_CHAP' } }' $i | awk -F ' ' '{ print $1 }')
+        
+            # check if first line of test file contains 'variant=' and retrieve its value. Set to the default variant if it does not
+            variant=$(awk -F 'variant=' 'FNR==1{ if ($0~"variant=") { print $2 } else { print '$DEFAULT_VARIANT' } }' $i | awk -F ' ' '{ print $1 }')
+            
+            # check if first line of test file contains 'source-test'
+            use_source_test=$(awk 'FNR==1{ if ($0~"source-test") print "yes" }' $i)
             if [[ $use_source_test == "yes" ]]
-            then test_source_framework $s $i
-            else test_source $s $i
+            then test_source_framework $s $i $chap $variant
+            else test_source $s $i $chap $variant
             fi
         done
 	fi