diff options
| author | Bob Arnson <bob@firegiant.com> | 2018-09-27 20:10:30 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2018-09-27 21:41:19 -0400 |
| commit | aa33b92c7a2e6b699a11532056485143b0edf4a3 (patch) | |
| tree | 06483f2a90d97ac164d427c57f0cfcd237fdc2c3 /src/test/WixToolsetTest.CoreIntegration/TestData | |
| parent | aed25de217d676bef1559290457b54444714e194 (diff) | |
| download | wix-aa33b92c7a2e6b699a11532056485143b0edf4a3.tar.gz wix-aa33b92c7a2e6b699a11532056485143b0edf4a3.tar.bz2 wix-aa33b92c7a2e6b699a11532056485143b0edf4a3.zip | |
Report preprocessor exceptions as errors. Fixes wixtoolset/issues#5881.
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/TestData')
4 files changed, 50 insertions, 0 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.en-us.wxl new file mode 100644 index 00000000..38c12ac1 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.en-us.wxl | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | |||
| 3 | <!-- | ||
| 4 | This file contains the declaration of all the localizable strings. | ||
| 5 | --> | ||
| 6 | <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US"> | ||
| 7 | |||
| 8 | <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String> | ||
| 9 | <String Id="FeatureTitle">MsiPackage</String> | ||
| 10 | |||
| 11 | </WixLocalization> | ||
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.wxs new file mode 100644 index 00000000..73577ce5 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/Package.wxs | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 3 | <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a"> | ||
| 4 | <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" /> | ||
| 5 | |||
| 6 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> | ||
| 7 | <MediaTemplate /> | ||
| 8 | |||
| 9 | <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> | ||
| 10 | <ComponentGroupRef Id="ProductComponents.x86" /> | ||
| 11 | <!-- <?if x64 == $(sys.BUILDARCH) ?> --> | ||
| 12 | <!-- <?if arm==$(sys.BUILDARCH) ?> --> | ||
| 13 | <?if $(sys.BUILDARCH) = "x64" ?> | ||
| 14 | <ComponentGroupRef Id="ProductComponents.x64" /> | ||
| 15 | <ComponentGroupRef Id="ProductComponents.arm" /> | ||
| 16 | </Feature> | ||
| 17 | </Product> | ||
| 18 | |||
| 19 | <Fragment> | ||
| 20 | <Directory Id="TARGETDIR" Name="SourceDir"> | ||
| 21 | <Directory Id="ProgramFilesFolder"> | ||
| 22 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | ||
| 23 | </Directory> | ||
| 24 | </Directory> | ||
| 25 | </Fragment> | ||
| 26 | </Wix> | ||
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/PackageComponents.wxs new file mode 100644 index 00000000..2a75e3d7 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/PackageComponents.wxs | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 3 | <?foreach ComponentPlatform in x86;x64;arm ?> | ||
| 4 | <Fragment> | ||
| 5 | <ComponentGroup Id="ProductComponents.$(var.ComponentPlatform)" Directory="INSTALLFOLDER"> | ||
| 6 | <Component> | ||
| 7 | <File Name="$(var.ComponentPlatform).dll" Source="test.txt" /> | ||
| 8 | </Component> | ||
| 9 | </ComponentGroup> | ||
| 10 | </Fragment> | ||
| 11 | <?endforeach?> | ||
| 12 | </Wix> | ||
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/data/test.txt b/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/data/test.txt new file mode 100644 index 00000000..cd0db0e1 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BadIf/data/test.txt | |||
| @@ -0,0 +1 @@ | |||
| This is test.txt. \ No newline at end of file | |||
