summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2013-01-12 02:37:21 +0100
committerMarc-André Lureau <marcandre.lureau@gmail.com>2013-01-15 16:24:44 +0100
commit024901670ee2bd32910d398c4a80258307f5ecb4 (patch)
treed3d010e564bfce849314e804c12816f8ef5284fb /tests
parent44624ba935aee3b8559ec8309331bda3ea37879c (diff)
downloadmsitools-024901670ee2bd32910d398c4a80258307f5ecb4.tar.gz
msitools-024901670ee2bd32910d398c4a80258307f5ecb4.tar.xz
msitools-024901670ee2bd32910d398c4a80258307f5ecb4.zip
wixl: implement preprocessor undef
Diffstat (limited to 'tests')
-rw-r--r--tests/data/wixl/IncludeTest.wxs4
-rw-r--r--tests/wixl.at2
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/data/wixl/IncludeTest.wxs b/tests/data/wixl/IncludeTest.wxs
index a5ea0c7..ea1832a 100644
--- a/tests/data/wixl/IncludeTest.wxs
+++ b/tests/data/wixl/IncludeTest.wxs
@@ -2,6 +2,10 @@
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<?ifdef var.Foo?>
<?warning Foo?>
+ <?undef Foo?>
+ <?ifdef var.Foo?>
+ <?error Foo?>
+ <?endif?>
<?else?>
<?ifdef var.Bar?>
<?warning Bar?>
diff --git a/tests/wixl.at b/tests/wixl.at
index 4e3eb9a..f9babd9 100644
--- a/tests/wixl.at
+++ b/tests/wixl.at
@@ -93,7 +93,7 @@ AT_CHECK_WIXL([-o out.msi IncludeTest.wxs], [0], [ignore],
[IncludeWarn.wxi:3: warning: IncludeWarn is included
])
AT_CHECK_WIXL([-D Bar -o out.msi IncludeTest.wxs], [0], [ignore],
-[IncludeTest.wxs:7: warning: Bar
+[IncludeTest.wxs:11: warning: Bar
])
AT_CHECK_WIXL([-D Foo -o out.msi IncludeTest.wxs], [0], [ignore],
[IncludeTest.wxs:4: warning: Foo