summaryrefslogtreecommitdiffstats
path: root/tests/wixl.at
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-01-25 09:33:25 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2013-01-25 09:45:36 +0100
commit6722623d62a9bb0e13c427fd677a79368aeefe9a (patch)
tree109c9259be1ec48372ce99b420cddeaab8efcec6 /tests/wixl.at
parent42e457fb52a35893e4a63cce42774dbf6d2fb3d6 (diff)
downloadmsitools-6722623d62a9bb0e13c427fd677a79368aeefe9a.tar.gz
msitools-6722623d62a9bb0e13c427fd677a79368aeefe9a.tar.xz
msitools-6722623d62a9bb0e13c427fd677a79368aeefe9a.zip
wixl: reorganize full_path, add the key element to the stable UUID
Call the resolver from the override of WixElementRef. Override in WixComponent, making it look at the key component. Add a new method to fetch the name part from a <File> or <RegistryValue> element.
Diffstat (limited to 'tests/wixl.at')
-rw-r--r--tests/wixl.at6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/wixl.at b/tests/wixl.at
index c28cc78..a773d13 100644
--- a/tests/wixl.at
+++ b/tests/wixl.at
@@ -35,9 +35,9 @@ AT_WIXLDATA([Manual.pdf])
AT_CHECK_WIXL([-o out.msi ComponentGUID.wxs], [0], [ignore], [ignore])
# FIXME: add tons of tests on out.msi
AT_CHECK([msiinfo export -s out.msi Component | sort | grep INSERT], [0],
-[INSERT INTO `Component` (`Component`, `ComponentId`, `Directory_`, `Attributes`, `KeyPath`) VALUES ('MainExecutable', '{8C320F7C-C521-5B19-A3C5-AF2B2ECEE71E}', 'INSTALLDIR', 0, 'FoobarEXE')
-INSERT INTO `Component` (`Component`, `ComponentId`, `Directory_`, `Attributes`, `KeyPath`) VALUES ('Manual', '{BAEE488E-70FF-566B-8A74-FE3107FDBDE2}', 'INSTALLDIR', 0, 'Manual')
-INSERT INTO `Component` (`Component`, `ComponentId`, `Directory_`, `Attributes`, `KeyPath`) VALUES ('ProgramMenuDir', '{F9F7F81C-5E64-5B7C-8018-FAF096969B88}', 'ProgramMenuDir', 4, 'reg5453B5C95074EA6F633E6D36318AFBF7')
+[INSERT INTO `Component` (`Component`, `ComponentId`, `Directory_`, `Attributes`, `KeyPath`) VALUES ('MainExecutable', '{E92F36A4-7332-5803-B56D-B30AED211451}', 'INSTALLDIR', 0, 'FoobarEXE')
+INSERT INTO `Component` (`Component`, `ComponentId`, `Directory_`, `Attributes`, `KeyPath`) VALUES ('Manual', '{E44FE0D4-A612-50BF-B231-0662EB694E2F}', 'INSTALLDIR', 0, 'Manual')
+INSERT INTO `Component` (`Component`, `ComponentId`, `Directory_`, `Attributes`, `KeyPath`) VALUES ('ProgramMenuDir', '{6B979E1B-8F32-5150-AA04-6D7B8BCB1614}', 'ProgramMenuDir', 4, 'reg5453B5C95074EA6F633E6D36318AFBF7')
])
AT_CLEANUP