Fix underquoting issue in DX_DO.

[dxcommon.git] / tests / macros.at

diff --git a/tests/macros.at b/tests/macros.at
index a5c8c5d2e4d3e78b5e66b8edd556d197d11edeef..f3ada4563f5230decf9b9ee6e93c211076e229ce 100644 (file)
--- a/tests/macros.at
+++ b/tests/macros.at
@@ -1,4 +1,4 @@
-dnl Copyright © 2015 Nick Bowler
+dnl Copyright © 2014-2015, 2018 Nick Bowler
 dnl
 dnl License WTFPL2: Do What The Fuck You Want To Public License, version 2.
 dnl This is free software: you are free to do what the fuck you want to.
@@ -25,6 +25,7 @@ m4_define([TEST_CONFIGURE], [AT_CHECK([./configure $1], [0], [ignore])])
 dnl Verify that the DX_BASEDIR macro expands correctly during argument
 dnl collection.  Crucially, the output must not contain any other text.
 AT_SETUP([DX_BASEDIR during argument collection])
+AT_KEYWORDS([DX_BASEDIR macro])
 
 AT_DATA([test.in],
 [[@TEST@
@@ -45,6 +46,7 @@ AT_CLEANUP
 
 dnl Verify that DX_BASEDIR is correctly AC_SUBSTed
 AT_SETUP([DX_BASEDIR output substitution])
+AT_KEYWORDS([DX_BASEDIR macro])
 
 AT_DATA([test.in],
 [[@DX_BASEDIR@
@@ -65,6 +67,7 @@ AT_CLEANUP
 
 dnl Verify that DX_BASEDIR is set correctly implicitly
 AT_SETUP([DX_BASEDIR implicit definition])
+AT_KEYWORDS([DX_BASEDIR macro])
 
 AT_DATA([test.in],
 [[@DX_BASEDIR@
@@ -80,6 +83,7 @@ TEST_CONFIGURE
 AT_CLEANUP
 
 AT_SETUP([DX_COMMAND_OUTPUT])
+AT_KEYWORDS([DX_COMMAND_OUTPUT macro])
 
 AT_DATA([expout],
 [[   leading whitespace
@@ -100,3 +104,24 @@ TEST_CONFIGURE
 AT_CHECK([cat test.out], [0], [expout])
 
 AT_CLEANUP
+
+AT_SETUP([DX_DO quoting])
+AT_KEYWORDS([DX_DO macro])
+
+TEST_CONFIGURE_AC(
+[[m4@&t@_define([FOO])
+:; { DX_DO([AS@&t@_ECHO_N(["[FOO]"])],
+           [AS@&t@_ECHO_N(["[FOO]"])],
+           [AS@&t@_ECHO(["[FOO]"])])
+} >test.out
+]])
+
+dnl TEST_CONFIGURE_AC(
+dnl [[DX_DO([AS@&t@_ECHO_N([hello,world])],[AS@&t@_ECHO_N([goodbye,world])])
+dnl ]])
+TEST_AUTORECONF
+TEST_CONFIGURE
+AT_CHECK([cat test.out], [0], [[FOOFOOFOO
+]])
+
+AT_CLEANUP