test,cram: print test messages prior to the execution of commands

aristanetworks · Oct 17, 2020 · 87e3bae · 87e3bae
1 parent 8d67c22
commit 87e3bae
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/test/cram.sh b/test/cram.sh
@@ -64,14 +64,18 @@ if [ -f "$what" -a -x "$what" ]; then
 
 	# reset environment, and define sensible defaults
 	env -i PATH="$PATH" LC_ALL=C TERM=dumb CRAM_PATH=$(dirname $0) \
-		gawk <"$what" >"$what".err '
+		gawk -v what="$what" <"$what" >"$what".err '
 	match($0, /^([[:space:]]+)\$(.*)$/, m) {
 		print $0
-		while ( ( "(" m[2] ") 2>&1 || echo [$?]" | getline ln ) > 0 ) {
+		while ( ( "(" m[2] "\n) 2>&1 || echo [$?]" | getline ln ) > 0 ) {
 			print m[1] ln
 		}
 	}
-	/^([^[:space:]].*|)$/ {
+	/^([^[:space:]].*)$/ {
+		print $0
+		print $0 | "cat 1>&2"
+	}
+	/^$/ {
 		print $0
 	}
 	'