diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-04-12 03:24:37 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-04-12 03:31:21 +0200 |
| commit | 7d50947ca464d4cbad135919385cde86fd2c4d69 (patch) | |
| tree | 43d4a12255e703bdf25bf773e9852401248d46b5 /tests | |
| parent | b69a90b060eea355ae5a35f0a0f9eb0d32c1d3af (diff) | |
| download | msitools-7d50947ca464d4cbad135919385cde86fd2c4d69.tar.gz msitools-7d50947ca464d4cbad135919385cde86fd2c4d69.tar.xz msitools-7d50947ca464d4cbad135919385cde86fd2c4d69.zip | |
preprocessor: add condition evaluator
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/data/wixl/arch-condition.wxs | 13 | ||||
| -rw-r--r-- | tests/wixl.at | 5 |
2 files changed, 17 insertions, 1 deletions
diff --git a/tests/data/wixl/arch-condition.wxs b/tests/data/wixl/arch-condition.wxs new file mode 100644 index 0000000..c870003 --- /dev/null +++ b/tests/data/wixl/arch-condition.wxs @@ -0,0 +1,13 @@ +<?xml version='1.0' encoding='windows-1252'?> +<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'> + <?if $(var.Arch) = x64 ?> + <?define ArchString = "(64 bit)" ?> + <?define Win64 = "yes" ?> + <?define ProgramFilesFolder = "ProgramFiles64Folder" ?> + <?else ?> + <?define ArchString = "" ?> + <?define Win64 = "no" ?> + <?define ProgramFilesFolder = "ProgramFilesFolder" ?> + <?endif ?> + <?warning $(var.Win64)?> +</Wix> diff --git a/tests/wixl.at b/tests/wixl.at index c11304c..d846b84 100644 --- a/tests/wixl.at +++ b/tests/wixl.at @@ -108,7 +108,10 @@ AT_CHECK_WIXL([-D Bar -o out.msi IncludeTest.wxs], [0], [ignore], AT_CHECK_WIXL([-D Foo -o out.msi IncludeTest.wxs], [0], [ignore], [IncludeTest.wxs:4: warning: Foo ]) -# FIXME: add tons of tests on out.msi +AT_WIXLDATA([arch-condition.wxs]) +AT_CHECK_WIXL([-o out.msi arch-condition.wxs], [0], [ignore], +[arch-condition.wxs:12: warning: no +]) AT_CHECK([test -f out.msi], [0]) AT_CLEANUP |