diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-01-08 17:46:15 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-01-08 18:21:13 +0100 |
| commit | c6e867fbf33342a047ae4f255c1b8ad3e03c5f69 (patch) | |
| tree | 81a9495a67d2b3a4f5c290b935a2d1000e374e2b /tests | |
| parent | 9cc9b8d81023f39900115bc38eb48c038c5d182f (diff) | |
| download | msitools-c6e867fbf33342a047ae4f255c1b8ad3e03c5f69.tar.gz msitools-c6e867fbf33342a047ae4f255c1b8ad3e03c5f69.tar.xz msitools-c6e867fbf33342a047ae4f255c1b8ad3e03c5f69.zip | |
Add preprocessor variables test
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testsuite.at | 41 |
1 files changed, 38 insertions, 3 deletions
diff --git a/tests/testsuite.at b/tests/testsuite.at index 104a2e9..194b4ab 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -16,7 +16,10 @@ AT_CHECK([cp $abs_srcdir/tests/data/$1 $1])]) AT_SETUP([Invalid command line]) AT_CHECK_WIXL([], [1], [ignore], [ignore]) -AT_CHECK_WIXL([out.msi], [1], [ignore], [ignore]) +AT_CHECK_WIXL([out.msi foo.wxs], [1], [ignore], [ignore]) +AT_CHECK_WIXL([-o out.msi], [1], [ignore], [ignore]) +AT_CHECK_WIXL([-E], [1], [ignore], [ignore]) +AT_CHECK_WIXL([-E -o out.msi], [1], [ignore], [ignore]) AT_CHECK([test -f out.msi], [1]) AT_CLEANUP @@ -25,7 +28,7 @@ AT_WIXLDATA([SampleFirst.wxs]) AT_WIXLDATA([FoobarAppl10.exe]) AT_WIXLDATA([Helper.dll]) AT_WIXLDATA([Manual.pdf]) -AT_CHECK_WIXL([out.msi SampleFirst.wxs], [0], [ignore], [ignore]) +AT_CHECK_WIXL([-o out.msi SampleFirst.wxs], [0], [ignore], [ignore]) # FIXME: add tons of tests on out.msi AT_CHECK([test -f out.msi], [0]) AT_CLEANUP @@ -36,7 +39,39 @@ AT_WIXLDATA([Manual.wxs]) AT_WIXLDATA([FoobarAppl10.exe]) AT_WIXLDATA([Helper.dll]) AT_WIXLDATA([Manual.pdf]) -AT_CHECK_WIXL([out.msi SampleFragment.wxs Manual.wxs], [0], [ignore], [ignore]) +AT_CHECK_WIXL([-o out.msi SampleFragment.wxs Manual.wxs], [0], [ignore], [ignore]) # FIXME: add tons of tests on out.msi AT_CHECK([test -f out.msi], [0]) AT_CLEANUP + +AT_SETUP([Preprocessor variables]) +export MY_VAR="Hello!" +AT_DATA([variables.wxs], [<?xml version="1.0"?> +<?define Version = "0.2.0"?> +<?define UpgradeCode = "ABCDDCBA-8392-0202-1993-199374829923"?> +<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'> + <Property Id="Id0" Value="$(var.UpgradeCode)"/> + <Property Id="Id0.1" Value="$$(var.UpgradeCode)"/> + <Property Id="Id0.2" Value="$$$(var.UpgradeCode)"/> + <?define UpgradeCode = "ABCDDCBA-8392-0202-1993-199374829924"?> + <Property Id="Id2" Value="$(var.UpgradeCode)"/> + <Property Id="Id3" Value="$(var.Version)"/> + <?define A = "A"?><?define B = "B"?> + <Property Id="IdAB" Value="$(var.A)$(var.B)"/> + <Property Id="IdHello" Value="$(env.MY_VAR)"/> + <Property Id="IdSys" Value="($(sys.SOURCEFILEDIR))foo"/> +</Wix> +]) +AT_CHECK_WIXL([-E variables.wxs], [0], [<?xml version="1.0"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <Property Id="Id0" Value="ABCDDCBA-8392-0202-1993-199374829923"/> + <Property Id="Id0.1" Value="$ABCDDCBA-8392-0202-1993-199374829923"/> + <Property Id="Id0.2" Value="$$ABCDDCBA-8392-0202-1993-199374829923"/> + <Property Id="Id2" Value="ABCDDCBA-8392-0202-1993-199374829924"/> + <Property Id="Id3" Value="0.2.0"/> + <Property Id="IdAB" Value="AB"/> + <Property Id="IdHello" Value="Hello!"/> + <Property Id="IdSys" Value="(variables.wxs)foo"/> +</Wix> +], [ignore]) +AT_CLEANUP |