78596: Subject: [3/8] msi/tests: Fix some test messages.
buildbot at kegel.com
buildbot at kegel.com
Fri Sep 9 04:16:44 CDT 2011
This is an experimental automated build and test service.
Please feel free to ignore this email while we work the kinks out.
The Buildbot has detected a failed build on builder runtests-gcc295 while building Wine.
Full details are available at: http://buildbot.kegel.com/builders/runtests-gcc295/builds/7 (though maybe not for long, as I'm still reinstalling the buildbot periodically while experimenting)
BUILD FAILED: failed shell_2
For more info about this message, see http://wiki.winehq.org/BuildBot
-------------- next part --------------
From: Hans Leidekker <hans at codeweavers.com>
Subject: [1/8] msi: Respect the indirect attribute in the SelectionPath event handler.
Message-Id: <1315558765.4177.19.camel at t400>
Date: Fri, 09 Sep 2011 10:59:18 +0200
---
dlls/msi/dialog.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 2210f17..caad21c 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -691,7 +691,8 @@ void msi_dialog_handle_event( msi_dialog* dialog, LPCWSTR control,
}
else if ( !strcmpW( attribute, szSelectionPath ) )
{
- LPWSTR path = msi_dialog_dup_property( dialog, ctrl->property, TRUE );
+ BOOL indirect = ctrl->attributes & msidbControlAttributesIndirect;
+ LPWSTR path = msi_dialog_dup_property( dialog, ctrl->property, indirect );
if (!path) return;
SetWindowTextW( ctrl->hwnd, path );
msi_free(path);
--
1.7.5.4
From: Hans Leidekker <hans at codeweavers.com>
Subject: [2/8] msi/test: Mark some test results as broken.
Message-Id: <1315558783.4177.20.camel at t400>
Date: Fri, 09 Sep 2011 10:59:36 +0200
---
dlls/msi/tests/install.c | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 1ebdd5d..04c709f 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -3154,12 +3154,14 @@ static void test_samesequence(void)
MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);
r = MsiInstallProductA(msifile, NULL);
- ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
- ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n");
- ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n");
- ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n");
- ok(delete_pf("msitest", FALSE), "Directory not created\n");
-
+ ok(r == ERROR_SUCCESS || broken(r == ERROR_INSTALL_FAILURE), "Expected ERROR_SUCCESS, got %u\n", r);
+ if (r == ERROR_SUCCESS)
+ {
+ ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n");
+ ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n");
+ ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n");
+ ok(delete_pf("msitest", FALSE), "Directory not created\n");
+ }
delete_cab_files();
DeleteFile(msifile);
}
@@ -3174,12 +3176,14 @@ static void test_uiLevelFlags(void)
MsiSetInternalUI(INSTALLUILEVEL_NONE | INSTALLUILEVEL_SOURCERESONLY, NULL);
r = MsiInstallProductA(msifile, NULL);
- ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
- ok(!delete_pf("msitest\\maximus", TRUE), "UI install occurred, but execute-only was requested.\n");
- ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n");
- ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n");
- ok(delete_pf("msitest", FALSE), "Directory not created\n");
-
+ ok(r == ERROR_SUCCESS || broken(r == ERROR_INSTALL_FAILURE), "Expected ERROR_SUCCESS, got %u\n", r);
+ if (r == ERROR_SUCCESS)
+ {
+ ok(!delete_pf("msitest\\maximus", TRUE), "UI install occurred, but execute-only was requested.\n");
+ ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n");
+ ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n");
+ ok(delete_pf("msitest", FALSE), "Directory not created\n");
+ }
delete_cab_files();
DeleteFile(msifile);
}
--
1.7.5.4
From: Hans Leidekker <hans at codeweavers.com>
Subject: [3/8] msi/tests: Fix some test messages.
Message-Id: <1315558801.4177.21.camel at t400>
Date: Fri, 09 Sep 2011 10:59:54 +0200
---
dlls/msi/tests/package.c | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index d240acf..04c3fe7 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -753,7 +753,7 @@ static MSIHANDLE create_package_db(void)
ok( res == ERROR_SUCCESS , "Failed to commit database\n" );
res = set_summary_info(hdb);
- ok( res == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", res);
+ ok( res == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", res);
res = run_query( hdb,
"CREATE TABLE `Directory` ( "
@@ -2467,12 +2467,12 @@ static void test_formatrecord2(void)
buffer[0] = 0;
sz = sizeof buffer;
r = MsiFormatRecord( hpkg, hrec, buffer, &sz );
- ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r);
+ ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r);
r = MsiRecordSetString(hrec, 0, "[foo][1]");
- ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r);
+ ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r);
r = MsiRecordSetString(hrec, 1, "hoo");
- ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r);
+ ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r);
sz = sizeof buffer;
r = MsiFormatRecord(hpkg, hrec, buffer, &sz);
ok( sz == 3, "size wrong\n");
@@ -2480,7 +2480,7 @@ static void test_formatrecord2(void)
ok( r == ERROR_SUCCESS, "format failed\n");
r = MsiRecordSetString(hrec, 0, "x[~]x");
- ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r);
+ ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r);
sz = sizeof buffer;
r = MsiFormatRecord(hpkg, hrec, buffer, &sz);
ok( sz == 3, "size wrong\n");
@@ -2488,9 +2488,9 @@ static void test_formatrecord2(void)
ok( r == ERROR_SUCCESS, "format failed\n");
r = MsiRecordSetString(hrec, 0, "[foo.$%}][1]");
- ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r);
+ ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r);
r = MsiRecordSetString(hrec, 1, "hoo");
- ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r);
+ ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r);
sz = sizeof buffer;
r = MsiFormatRecord(hpkg, hrec, buffer, &sz);
ok( sz == 3, "size wrong\n");
@@ -2498,7 +2498,7 @@ static void test_formatrecord2(void)
ok( r == ERROR_SUCCESS, "format failed\n");
r = MsiRecordSetString(hrec, 0, "[\\[]");
- ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r);
+ ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r);
sz = sizeof buffer;
r = MsiFormatRecord(hpkg, hrec, buffer, &sz);
ok( sz == 1, "size wrong\n");
@@ -2507,7 +2507,7 @@ static void test_formatrecord2(void)
SetEnvironmentVariable("FOO", "BAR");
r = MsiRecordSetString(hrec, 0, "[%FOO]");
- ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r);
+ ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r);
sz = sizeof buffer;
r = MsiFormatRecord(hpkg, hrec, buffer, &sz);
ok( sz == 3, "size wrong\n");
@@ -2515,9 +2515,9 @@ static void test_formatrecord2(void)
ok( r == ERROR_SUCCESS, "format failed\n");
r = MsiRecordSetString(hrec, 0, "[[1]]");
- ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r);
+ ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r);
r = MsiRecordSetString(hrec, 1, "%FOO");
- ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r);
+ ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r);
sz = sizeof buffer;
r = MsiFormatRecord(hpkg, hrec, buffer, &sz);
ok( sz == 3, "size wrong\n");
@@ -8442,13 +8442,13 @@ static void test_appsearch_reglocator(void)
sprintf(path, "\"%s\\FileName1\" -option", CURR_DIR);
res = RegSetValueExA(hklm, "value16", 0, REG_SZ,
(const BYTE *)path, lstrlenA(path) + 1);
- ok( res == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", res);
+ ok( res == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", res);
space = (strchr(CURR_DIR, ' ')) ? TRUE : FALSE;
sprintf(path, "%s\\FileName1 -option", CURR_DIR);
res = RegSetValueExA(hklm, "value17", 0, REG_SZ,
(const BYTE *)path, lstrlenA(path) + 1);
- ok( res == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", res);
+ ok( res == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", res);
hdb = create_package_db();
ok(hdb, "Expected a valid database handle\n");
@@ -9659,7 +9659,7 @@ static void test_featureparents(void)
/* msidbFeatureAttributesFavorLocal:msidbComponentAttributesOptional */
r = add_component_entry( hdb, "'lepus', '', 'TARGETDIR', 2, '', 'lepus_file'" );
- ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r);
+ ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r);
r = add_feature_components_entry( hdb, "'zodiac', 'leo'" );
ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r );
@@ -10108,19 +10108,19 @@ static void test_installprops(void)
size = MAX_PATH;
r = MsiGetProperty(hpkg, "UserLanguageID", buf, &size);
- ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r);
+ ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r);
ok( !lstrcmpA(buf, path), "Expected \"%s\", got \"%s\"\n", path, buf);
res = GetSystemMetrics(SM_CXSCREEN);
size = MAX_PATH;
r = MsiGetProperty(hpkg, "ScreenX", buf, &size);
- ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r);
+ ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r);
ok(atol(buf) == res, "Expected %d, got %ld\n", res, atol(buf));
res = GetSystemMetrics(SM_CYSCREEN);
size = MAX_PATH;
r = MsiGetProperty(hpkg, "ScreenY", buf, &size);
- ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r);
+ ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r);
ok(atol(buf) == res, "Expected %d, got %ld\n", res, atol(buf));
if (pGetSystemInfo && pSHGetFolderPathA)
--
1.7.5.4
More information about the wine-tests-results
mailing list