jstest: run1: make expected output optional

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/jstest/lower.nodejs b/jstest/lower.nodejs
index e3aae5ebf8a6635a3051b5bc31d3a84c31b293f2..2f5c975021908fba574cd3a84ac5281f1f4f4361 100644 (file)
--- a/jstest/lower.nodejs
+++ b/jstest/lower.nodejs
@@ -1,7 +1,4 @@
 // -*- JavaScript -*-
-//
-// @@expect
-// @@end
 
 const fs = require('fs');
 let wasm_bindgen = require('otter_wasm.js');

diff --git a/jstest/run1 b/jstest/run1
index b8463b5b726fbe9a08b042d2c0b54b03d40cab20..3676e9678c07b8e368cfb26f0c99f192ee6335b6 100755 (executable)
--- a/jstest/run1
+++ b/jstest/run1
@@ -18,13 +18,17 @@ ln -s ../../target/jstest/otter_wasm{.js,_bg.wasm} .
 export NODE_PATH=.
 ln -sf "$@" .
 
-sed -n <$1 '
-       /^\/\/ @@expect/,/^\/\/ @@end/ {
-               s/^\/\/ //;
-               /^@@/d;
-               p;
-       }
-' >expect
+if grep '^\/\/ @expect' $1; then
+       sed -n <$1 '
+               /^\/\/ @@expect/,/^\/\/ @@end/ {
+                       s/^\/\/ //;
+                       /^@@/d;
+                       p;
+               }
+       ' >expect
+else
+       rm -f expect
+fi
 
 exec 3>run.js
 sed >&3 <script.js '/^\/\/@@notest/,/^\/\/@@/d'
@@ -40,5 +44,8 @@ if [ $rc != 0 ]; then
        egrep '' /dev/null output ||:
 fi
 
-diff -u expect output
+if test -f expect; then
+       diff -u expect output
+fi
+
 exit $rc