Browse Source

Test STIG separately and with no output if all tests pass

Bob Mottram 8 years ago
parent
commit
0e47f66928
1 changed files with 13 additions and 4 deletions
  1. 13
    4
      src/freedombone-tests

+ 13
- 4
src/freedombone-tests View File

@@ -61,6 +61,9 @@ function test_app_function_type {
61 61
 }
62 62
 
63 63
 function test_app_functions {
64
+    if [ $RUN_STIG ]; then
65
+        return
66
+    fi
64 67
     FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
65 68
 
66 69
     # check that these functions exist
@@ -78,6 +81,10 @@ function test_app_functions {
78 81
 }
79 82
 
80 83
 function test_unique_onion_ports {
84
+    if [ $RUN_STIG ]; then
85
+        return
86
+    fi
87
+
81 88
     # test that some services are not assigned the same onion port
82 89
     FILES=src/${PROJECT_NAME}-app-*
83 90
     ports=$(grep -r "_ONION_PORT=" $FILES | awk -F ':' '{print $2}' | uniq | awk -F '=' '{print $2}')
@@ -1093,11 +1100,13 @@ function test_stig {
1093 1100
     output "V-58901" $? ${SETLANG}
1094 1101
     ################
1095 1102
 
1096
-    echo ''
1097
-    echo "Passes: $PASSES"
1098
-    echo "Fails:  $FAILS"
1099 1103
     if [ $FAILS -gt 0 ]; then
1100
-        exit 792353
1104
+        echo ''
1105
+        echo "Passes: $PASSES"
1106
+        echo "Fails:  $FAILS"
1107
+        if [ $FAILS -gt 0 ]; then
1108
+            exit 792353
1109
+        fi
1101 1110
     fi
1102 1111
 }
1103 1112