X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/926b8d8fb3ecffe60f3eaefcd5ec40a5273251ce..9cd8750733369d0399b8b6deac91af8badd9000f:/tests/options.at

diff --git a/tests/options.at b/tests/options.at
index 4fb710e..820416a 100644
--- a/tests/options.at
+++ b/tests/options.at
@@ -1,4 +1,4 @@
-dnl Copyright © 2020 Nick Bowler
+dnl Copyright © 2020-2023 Nick Bowler
 dnl License GPLv2+: GNU General Public License version 2 or any later version.
 dnl This is free software: you are free to change and redistribute it.
 dnl There is NO WARRANTY, to the extent permitted by law.
@@ -18,7 +18,7 @@ AT_SETUP([--version option])
 AT_KEYWORDS([option])dnl
 
 AT_CHECK([gob2 invalid-file.gob --version --invalid-option], [0], [stdout])
-AT_CHECK([awk 'NR == 1 { print $NF }' stdout], [0], [AT_PACKAGE_VERSION
+AT_CHECK([$AWK 'NR == 1 { print $NF }' stdout], [0], [AT_PACKAGE_VERSION
 ])
 
 AT_CLEANUP
@@ -286,9 +286,9 @@ m4_foreach([OPTION], [[[--no-touch]], [[--no-touch-headers]]],
 AT_KEYWORDS([option])dnl
 
 # Sanity check for make implementation
-touch test.h; touch test-h
+echo >>test.h; echo >>test-h
 AT_CHECK([mtime_uptodate test-h test.h || exit 77])
-TEST_MTIME_DELAY; touch test.h
+TEST_MTIME_DELAY; echo >>test.h
 AT_CHECK([mtime_uptodate test-h test.h && exit 77], [1])
 rm -f test.h
 
@@ -299,14 +299,14 @@ AT_DATA([test.gob], [[class :Test from G:Object
 ]])
 
 AT_CHECK([gob2 test.gob])
-touch test-c test-h test-private
+echo >>test-c; echo >>test-h; echo >>test-private
 TEST_MTIME_DELAY
 AT_CHECK([gob2 test.gob])
 AT_CHECK([mtime_uptodate test-c test.c], [1])
 AT_CHECK([mtime_uptodate test-h test.h], [1])
 AT_CHECK([mtime_uptodate test-private test-private.h], [1])
 
-touch test-c test-h test-private
+echo >>test-c; echo >>test-h; echo >>test-private
 TEST_MTIME_DELAY
 AT_CHECK([gob2 test.gob OPTION])
 AT_CHECK([mtime_uptodate test-c test.c],
@@ -319,7 +319,7 @@ cat >>test.gob <<'EOF'
 /* some code */
 %}
 EOF
-touch test-c test-h test-private
+echo >>test-c; echo >>test-h; echo >>test-private
 TEST_MTIME_DELAY
 AT_CHECK([gob2 test.gob OPTION])
 AT_CHECK([mtime_uptodate test-c test.c], [1])
@@ -331,7 +331,7 @@ cat >>test.gob <<'EOF'
 /* yonder comment */
 %}
 EOF
-touch test-c test-h test-private
+echo >>test-c; echo >>test-h; echo >>test-private
 TEST_MTIME_DELAY
 AT_CHECK([gob2 test.gob OPTION])
 AT_CHECK([mtime_uptodate test-c test.c],
@@ -344,7 +344,7 @@ cat >>test.gob <<'EOF'
 /* once more unto the breach */
 %}
 EOF
-touch test-c test-h test-private
+echo >>test-c; echo >>test-h; echo >>test-private
 TEST_MTIME_DELAY
 AT_CHECK([gob2 test.gob OPTION])
 AT_CHECK([mtime_uptodate test-c test.c],
@@ -418,9 +418,6 @@ class :Test from G:Object
 }
 ]])
 
-# --no-gnu is currently busted for the get_type function declaration.
-AT_XFAIL_IF([:])
-
 AT_CHECK([gob2 test.gob])
 AT_CHECK([cat test*.h test.c | grep '_GNUC_' >/dev/null], [0])
 
@@ -572,6 +569,18 @@ AT_CHECK([gob2 --m4 filename --help I am trapped in a test case factory --],
   [0], [], [experr])
 AT_CHECK([test -f m4-test.c])
 
+set x $gob_m4_args; shift
+for arg
+do
+  shift
+  AS_CASE([$arg], [filename], [], [*], [set x "$@" "$arg"; shift])
+done
+
+cat >experr <<EOF
+$* -- filename
+EOF
+AT_CHECK([gob2 --m4 -- filename], [0], [], [experr])
+
 AT_CLEANUP
 
 dnl Check that the --m4 option shells out to m4 and passes through