Added several tests

test.sh

@@ -14,10 +14,11 @@ for FILE in *; do
         cd "$FILE"
         printf $FORMAT $FILE
         if [ -f "test.sh" ]; then
+            test_number=0
             ./test.sh > ./test.output
             testresult=$?
             if [ $testresult -eq 1 ]; then
-                echo -e "${RED}FAIL${NOCOLOR}"
+                echo -e " ${RED}FAIL${NOCOLOR}"
                 failed=$((failed+1))
             else
                 if [ $testresult -eq 2 ]; then

tests/Conditional_asm/test.output

@@ -0,0 +1 @@
+All (1) files assembled succesfully

tests/Conditional_asm/test.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+# Positive test - assembler needs to pass all tests in all subfolders
+# return 0 on succesfull tests (all passed)
+# return 1 on issue during test (one or more tests didn't pass correctly)
+# return 2 on error in test SETUP 
+#
+
+test_number=0
+tests_successfull=0
+
+cd tests
+rm -f *.bin
+for FILE in *; do
+    if [ -f "$FILE" ]; then
+        test_number=$((test_number+1))
+        ../$ASMBIN $FILE -b FF > ../asm.output
+        if [ $? -eq 1 ]; then 
+            echo "Error in" \'$FILE\'
+        else
+            tests_successfull=$((tests_successfull+1))
+        fi 
+    fi
+done
+rm -f *.bin
+cd ..
+
+rm -f asm.output
+if [ $test_number -eq $tests_successfull ]; then
+    echo "All ($test_number) files assembled succesfully"
+    exit 0
+else
+    exit 1
+fi
+exit 0

tests/conditional/test.s → tests/Conditional_asm/tests/basic_ifelse.s

@@ -1,8 +1,8 @@
-TEST: EQU 1
-
-.if TEST
-    ld a,1
-.else
-    ld a,2
-.endif
-
+TEST: EQU 1
+
+.if TEST
+    ld a,1
+.else
+    ld a,2
+.endif
+

tests/Errors_labels/test.sh

@@ -5,14 +5,14 @@
 # return 2 on error in test SETUP 
 #
 
-negtest_number=0
+test_number=0
 negtest_failed_successfull=0
 
 cd tests
 rm -f *.bin
 for FILE in *; do
     if [ -f "$FILE" ]; then
-        negtest_number=$((negtest_number+1))
+        test_number=$((test_number+1))
         ../$ASMBIN $FILE -b FF > ../asm.output
         if [ $? -eq 0 ]; then 
             echo "Failed to detect error in" \'$FILE\'
@@ -25,8 +25,8 @@ rm -f *.bin
 cd ..
 
 rm -f asm.output
-if [ $negtest_number -eq $negtest_failed_successfull ]; then
-    echo "Detected all errors succesfully"
+if [ $test_number -eq $negtest_failed_successfull ]; then
+    echo "Detected all ($test_number) errors succesfully"
     exit 0
 else
     exit 1

tests/Errors_literals/test copy.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+# Negative test - assembler needs to fail tests in all subfolders
+# return 0 on succesfull test (all failed)
+# return 1 on issue during test (one or more tests didn't fail correctly)
+# return 2 on error in test SETUP 
+#
+
+test_number=0
+negtest_failed_successfull=0
+
+cd tests
+rm -f *.bin
+for FILE in *; do
+    if [ -f "$FILE" ]; then
+        test_number=$((test_number+1))
+        ../$ASMBIN $FILE -b FF > ../asm.output
+        if [ $? -eq 0 ]; then 
+            echo "Failed to detect error in" \'$FILE\'
+        else
+            negtest_failed_successfull=$((negtest_failed_successfull+1))
+        fi 
+    fi
+done
+rm -f *.bin
+cd ..
+
+rm -f asm.output
+if [ $test_number -eq $negtest_failed_successfull ]; then
+    echo "Detected all ($test_number) errors succesfully"
+    exit 0
+else
+    exit 1
+fi
+exit 0

tests/Errors_literals/test.output

@@ -1 +1 @@
-Detected all errors succesfully
+Detected all (5) errors succesfully

tests/Errors_literals/test.sh

@@ -5,14 +5,14 @@
 # return 2 on error in test SETUP 
 #
 
-negtest_number=0
+test_number=0
 negtest_failed_successfull=0
 
 cd tests
 rm -f *.bin
 for FILE in *; do
     if [ -f "$FILE" ]; then
-        negtest_number=$((negtest_number+1))
+        test_number=$((test_number+1))
         ../$ASMBIN $FILE -b FF > ../asm.output
         if [ $? -eq 0 ]; then 
             echo "Failed to detect error in" \'$FILE\'
@@ -25,8 +25,8 @@ rm -f *.bin
 cd ..
 
 rm -f asm.output
-if [ $negtest_number -eq $negtest_failed_successfull ]; then
-    echo "Detected all errors succesfully"
+if [ $test_number -eq $negtest_failed_successfull ]; then
+    echo "Detected all ($test_number) errors succesfully"
     exit 0
 else
     exit 1

tests/Errors_macros/test.sh

@@ -5,14 +5,14 @@
 # return 2 on error in test SETUP 
 #
 
-negtest_number=0
+test_number=0
 negtest_failed_successfull=0
 
 cd tests
 rm -f *.bin
 for FILE in *; do
     if [ -f "$FILE" ]; then
-        negtest_number=$((negtest_number+1))
+        test_number=$((test_number+1))
         ../$ASMBIN $FILE -b FF > ../asm.output
         if [ $? -eq 0 ]; then 
             echo "Failed to detect error in" \'$FILE\'
@@ -25,8 +25,8 @@ rm -f *.bin
 cd ..
 
 rm -f asm.output
-if [ $negtest_number -eq $negtest_failed_successfull ]; then
-    echo "Detected all errors succesfully"
+if [ $test_number -eq $negtest_failed_successfull ]; then
+    echo "Detected all ($test_number) errors succesfully"
     exit 0
 else
     exit 1

tests/Errors_opcodes/test.sh

@@ -5,14 +5,14 @@
 # return 2 on error in test SETUP 
 #
 
-negtest_number=0
+test_number=0
 negtest_failed_successfull=0
 
 cd tests
 rm -f *.bin
 for FILE in *; do
     if [ -f "$FILE" ]; then
-        negtest_number=$((negtest_number+1))
+        test_number=$((test_number+1))
         ../$ASMBIN $FILE -b FF > ../asm.output
         if [ $? -eq 0 ]; then 
             echo "Failed to detect error in" \'$FILE\'
@@ -25,8 +25,8 @@ rm -f *.bin
 cd ..
 
 rm -f asm.output
-if [ $negtest_number -eq $negtest_failed_successfull ]; then
-    echo "Detected all errors succesfully"
+if [ $test_number -eq $negtest_failed_successfull ]; then
+    echo "Detected all ($test_number) errors succesfully"
     exit 0
 else
     exit 1

tests/Errors_registers/test.sh

@@ -5,14 +5,14 @@
 # return 2 on error in test SETUP 
 #
 
-negtest_number=0
+test_number=0
 negtest_failed_successfull=0
 
 cd tests
 rm -f *.bin
 for FILE in *; do
     if [ -f "$FILE" ]; then
-        negtest_number=$((negtest_number+1))
+        test_number=$((test_number+1))
         ../$ASMBIN $FILE -b FF > ../asm.output
         if [ $? -eq 0 ]; then 
             echo "Failed to detect error in" \'$FILE\'
@@ -25,8 +25,8 @@ rm -f *.bin
 cd ..
 
 rm -f asm.output
-if [ $negtest_number -eq $negtest_failed_successfull ]; then
-    echo "Detected all errors succesfully"
+if [ $test_number -eq $negtest_failed_successfull ]; then
+    echo "Detected all ($test_number) errors succesfully"
     exit 0
 else
     exit 1

tests/Errors_strings/test.sh

@@ -5,14 +5,14 @@
 # return 2 on error in test SETUP 
 #
 
-negtest_number=0
+test_number=0
 negtest_failed_successfull=0
 
 cd tests
 rm -f *.bin
 for FILE in *; do
     if [ -f "$FILE" ]; then
-        negtest_number=$((negtest_number+1))
+        test_number=$((test_number+1))
         ../$ASMBIN $FILE -b FF > ../asm.output
         if [ $? -eq 0 ]; then 
             echo "Failed to detect error in" \'$FILE\'
@@ -25,8 +25,8 @@ rm -f *.bin
 cd ..
 
 rm -f asm.output
-if [ $negtest_number -eq $negtest_failed_successfull ]; then
-    echo "Detected all errors succesfully"
+if [ $test_number -eq $negtest_failed_successfull ]; then
+    echo "Detected all ($test_number) errors succesfully"
     exit 0
 else
     exit 1

tests/Errors_value_operators/test copy.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+# Negative test - assembler needs to fail tests in all subfolders
+# return 0 on succesfull test (all failed)
+# return 1 on issue during test (one or more tests didn't fail correctly)
+# return 2 on error in test SETUP 
+#
+
+test_number=0
+negtest_failed_successfull=0
+
+cd tests
+rm -f *.bin
+for FILE in *; do
+    if [ -f "$FILE" ]; then
+        test_number=$((test_number+1))
+        ../$ASMBIN $FILE -b FF > ../asm.output
+        if [ $? -eq 0 ]; then 
+            echo "Failed to detect error in" \'$FILE\'
+        else
+            negtest_failed_successfull=$((negtest_failed_successfull+1))
+        fi 
+    fi
+done
+rm -f *.bin
+cd ..
+
+rm -f asm.output
+if [ $test_number -eq $negtest_failed_successfull ]; then
+    echo "Detected all ($test_number) errors succesfully"
+    exit 0
+else
+    exit 1
+fi
+exit 0

tests/Errors_value_operators/test.output

@@ -0,0 +1,3 @@
+Failed to detect error in 'illegal_shift_left.s'
+Failed to detect error in 'illegal_shift_right.s'
+Failed to detect error in 'illegal_unary_times.s'

tests/Errors_value_operators/test.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+# Negative test - assembler needs to fail tests in all subfolders
+# return 0 on succesfull test (all failed)
+# return 1 on issue during test (one or more tests didn't fail correctly)
+# return 2 on error in test SETUP 
+#
+
+test_number=0
+negtest_failed_successfull=0
+
+cd tests
+rm -f *.bin
+for FILE in *; do
+    if [ -f "$FILE" ]; then
+        test_number=$((test_number+1))
+        ../$ASMBIN $FILE -b FF > ../asm.output
+        if [ $? -eq 0 ]; then 
+            echo "Failed to detect error in" \'$FILE\'
+        else
+            negtest_failed_successfull=$((negtest_failed_successfull+1))
+        fi 
+    fi
+done
+rm -f *.bin
+cd ..
+
+rm -f asm.output
+if [ $test_number -eq $negtest_failed_successfull ]; then
+    echo "Detected all ($test_number) errors succesfully"
+    exit 0
+else
+    exit 1
+fi
+exit 0

tests/Errors_value_operators/tests/illegal_shift_left.s

@@ -0,0 +1 @@
+	ld a, 8 < 2

tests/Errors_value_operators/tests/illegal_shift_right.s

@@ -0,0 +1 @@
+	ld a, 8 > 2

tests/Labels/test.output

@@ -0,0 +1 @@
+All (11) files assembled succesfully

tests/Labels/test.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+# Positive test - assembler needs to pass all tests in all subfolders
+# return 0 on succesfull tests (all passed)
+# return 1 on issue during test (one or more tests didn't pass correctly)
+# return 2 on error in test SETUP 
+#
+
+test_number=0
+tests_successfull=0
+
+cd tests
+rm -f *.bin
+for FILE in *; do
+    if [ -f "$FILE" ]; then
+        test_number=$((test_number+1))
+        ../$ASMBIN $FILE -b FF > ../asm.output
+        if [ $? -eq 1 ]; then 
+            echo "Error in" \'$FILE\'
+        else
+            tests_successfull=$((tests_successfull+1))
+        fi 
+    fi
+done
+rm -f *.bin
+cd ..
+
+rm -f asm.output
+if [ $test_number -eq $tests_successfull ]; then
+    echo "All ($test_number) files assembled succesfully"
+    exit 0
+else
+    exit 1
+fi
+exit 0

tests/Labels/tests/back_reference.s

@@ -0,0 +1,6 @@
+back:
+	ld a,b
+	jp back
+newlabel:
+	ld a,b
+	jp back