Merge pull request #2469 from GaloisInc/error-line-numbers

Hide the line number of "error" in the test suite

Author: sauclovian-g

intTests/support/test-and-diff.sh

@@ -136,12 +136,20 @@ run-tests() {
         # use default Show instances and the saw-core positions carry
         # the directory and filename separately. This becomes
         # "interesting" from a quoting perspective...
+        #
+        # Furthermore, prune the line number from the results of
+        # hitting the Haskell "error" function. SAW isn't supposed to
+        # use "error", but it does, and some things trigger it, and
+        # having the source line number in the reference outputs is
+        # super aggravating because it changes all the time, usually
+        # when you aren't expecting it.
         sed < $TEST.rawlog '
             /^\[[0-9][0-9]:[0-9][0-9]:[0-9][0-9]\.[0-9][0-9][0-9]\] /{
                 s/^..............//
             }
             s,'"$CURDIR"'/,,g
             s,"'"$CURDIR"'",".",g
+            /^  error, called at [^ :]*\.hs:[0-9:]* in saw-/s/\.hs:.*/.hs/
         ' | (
             # If there's a custom postprocess script for this test,
             # chain it in.

intTests/test1646/test2.log.good

@@ -2,5 +2,5 @@
  x=a
  fromValue Text
 CallStack (from HasCallStack):
-  error, called at saw-script/src/SAWScript/Interpreter.hs:1110:19 in saw-1.3.0.99-inplace-saw-script:SAWScript.Interpreter
+  error, called at saw-script/src/SAWScript/Interpreter.hs
 FAILED

intTests/test_sawscript_builtins/undefined2.log.good

@@ -1,5 +1,5 @@
  Loading file "undefined2.saw"
  interpret: undefined
 CallStack (from HasCallStack):
-  error, called at saw-script/src/SAWScript/Interpreter.hs:4052:14 in saw-1.3.0.99-inplace-saw-script:SAWScript.Interpreter
+  error, called at saw-script/src/SAWScript/Interpreter.hs
 FAILED

intTests/test_sawscript_builtins/undefined3.log.good

@@ -1,5 +1,5 @@
  Loading file "undefined3.saw"
  interpret: undefined
 CallStack (from HasCallStack):
-  error, called at saw-script/src/SAWScript/Interpreter.hs:4052:14 in saw-1.3.0.99-inplace-saw-script:SAWScript.Interpreter
+  error, called at saw-script/src/SAWScript/Interpreter.hs
 FAILED

intTests/test_sawscript_builtins/undefined4.log.good

@@ -2,5 +2,5 @@
  not dead yet
  interpret: undefined
 CallStack (from HasCallStack):
-  error, called at saw-script/src/SAWScript/Interpreter.hs:4052:14 in saw-1.3.0.99-inplace-saw-script:SAWScript.Interpreter
+  error, called at saw-script/src/SAWScript/Interpreter.hs
 FAILED

intTests/test_sawscript_builtins/undefined5.log.good

@@ -3,5 +3,5 @@
  still not dead
  interpret: undefined
 CallStack (from HasCallStack):
-  error, called at saw-script/src/SAWScript/Interpreter.hs:4052:14 in saw-1.3.0.99-inplace-saw-script:SAWScript.Interpreter
+  error, called at saw-script/src/SAWScript/Interpreter.hs
 FAILED

intTests/test_sawscript_builtins/undefined6.log.good

@@ -3,5 +3,5 @@
  still not dead
  interpret: undefined
 CallStack (from HasCallStack):
-  error, called at saw-script/src/SAWScript/Interpreter.hs:4052:14 in saw-1.3.0.99-inplace-saw-script:SAWScript.Interpreter
+  error, called at saw-script/src/SAWScript/Interpreter.hs
 FAILED

intTests/test_sawscript_builtins/undefined7.log.good

@@ -1,5 +1,5 @@
  Loading file "undefined7.saw"
  interpret: undefined
 CallStack (from HasCallStack):
-  error, called at saw-script/src/SAWScript/Interpreter.hs:4052:14 in saw-1.3.0.99-inplace-saw-script:SAWScript.Interpreter
+  error, called at saw-script/src/SAWScript/Interpreter.hs
 FAILED