X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/268cd12f990b95d82d00e639288563c6c6ce9452..4ebed70c2119e843ce48ae4fa6076475d2100693:/tests/options.at

diff --git a/tests/options.at b/tests/options.at
index 30be9e2..089a87e 100644
--- a/tests/options.at
+++ b/tests/options.at
@@ -1,4 +1,4 @@
-dnl Copyright © 2020 Nick Bowler
+dnl Copyright © 2020-2022 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
@@ -298,10 +298,6 @@ AT_DATA([test.gob], [[class :Test from G:Object
 }
 ]])
 
-m4_if(OPTION, [--no-touch-headers],
-[#Currently, the private header is modified even with --no-touch-headers.
-AT_XFAIL_IF([:])])dnl
-
 AT_CHECK([gob2 test.gob])
 touch test-c test-h test-private
 TEST_MTIME_DELAY
@@ -422,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])
 
@@ -576,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