December 2012 - Wine-commits

Andrew Talbot : comctl32: Indentation fix.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 85ebbadcb09993b0a91415c2a8447c5bb64969d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85ebbadcb09993b0a91415c2a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 15 14:43:16 2012 +0000 comctl32: Indentation fix. --- dlls/comctl32/datetime.c | 20 ++++++++++---------- dlls/comctl32/toolbar.c | 6 +++--- dlls/comctl32/treeview.c | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 748e0fc..faecba0 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -205,16 +205,16 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *sy systime->wHour, systime->wMinute, systime->wSecond); if (flag == GDT_VALID) { - if (systime->wYear == 0 || - systime->wMonth < 1 || systime->wMonth > 12 || - systime->wDay < 1 || - systime->wDay > MONTHCAL_MonthLength(systime->wMonth, systime->wYear) || - systime->wHour > 23 || - systime->wMinute > 59 || - systime->wSecond > 59 || - systime->wMilliseconds > 999 - ) - return FALSE; + if (systime->wYear == 0 || + systime->wMonth < 1 || systime->wMonth > 12 || + systime->wDay < 1 || + systime->wDay > MONTHCAL_MonthLength(systime->wMonth, systime->wYear) || + systime->wHour > 23 || + systime->wMinute > 59 || + systime->wSecond > 59 || + systime->wMilliseconds > 999 + ) + return FALSE; /* Windows returns true if the date is valid but outside the limits set */ if (DATETIME_IsDateInValidRange(infoPtr, systime) == FALSE) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index c26d70e..2a98b6b 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5212,9 +5212,9 @@ TOOLBAR_Destroy (TOOLBAR_INFO *infoPtr) if (infoPtr->himlInt) ImageList_Destroy (infoPtr->himlInt); - TOOLBAR_DeleteImageList(&infoPtr->himlDef, &infoPtr->cimlDef); - TOOLBAR_DeleteImageList(&infoPtr->himlDis, &infoPtr->cimlDis); - TOOLBAR_DeleteImageList(&infoPtr->himlHot, &infoPtr->cimlHot); + TOOLBAR_DeleteImageList(&infoPtr->himlDef, &infoPtr->cimlDef); + TOOLBAR_DeleteImageList(&infoPtr->himlDis, &infoPtr->cimlDis); + TOOLBAR_DeleteImageList(&infoPtr->himlHot, &infoPtr->cimlHot); /* delete default font */ DeleteObject (infoPtr->hDefaultFont); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 22d7180..b0cbc7a 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3164,10 +3164,10 @@ TREEVIEW_Sort(TREEVIEW_INFO *infoPtr, HTREEITEM parent, { int visOrder = infoPtr->firstVisible->visibleOrder; - if (parent == infoPtr->root) - TREEVIEW_RecalculateVisibleOrder(infoPtr, NULL); - else - TREEVIEW_RecalculateVisibleOrder(infoPtr, parent); + if (parent == infoPtr->root) + TREEVIEW_RecalculateVisibleOrder(infoPtr, NULL); + else + TREEVIEW_RecalculateVisibleOrder(infoPtr, parent); if (TREEVIEW_IsChildOf(parent, infoPtr->firstVisible)) {

1 0

Andrew Talbot : gdi32: Indentation fix.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 0653f7a64d7c5c26b8b3ed255d9169ae208a58c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0653f7a64d7c5c26b8b3ed255… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 15 18:55:12 2012 +0000 gdi32: Indentation fix. --- dlls/gdi32/font.c | 101 +++++++++++++++++++++++++++------------------------- 1 files changed, 52 insertions(+), 49 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 33e603c..6574761 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3127,13 +3127,13 @@ GetCharacterPlacementA(HDC hdc, LPCSTR lpString, INT uCount, */ DWORD WINAPI GetCharacterPlacementW( - HDC hdc, /* [in] Device context for which the rendering is to be done */ - LPCWSTR lpString, /* [in] The string for which information is to be returned */ - INT uCount, /* [in] Number of WORDS in string. */ - INT nMaxExtent, /* [in] Maximum extent the string is to take (in HDC logical units) */ - GCP_RESULTSW *lpResults,/* [in/out] A pointer to a GCP_RESULTSW struct */ - DWORD dwFlags /* [in] Flags specifying how to process the string */ - ) + HDC hdc, /* [in] Device context for which the rendering is to be done */ + LPCWSTR lpString, /* [in] The string for which information is to be returned */ + INT uCount, /* [in] Number of WORDS in string. */ + INT nMaxExtent, /* [in] Maximum extent the string is to take (in HDC logical units) */ + GCP_RESULTSW *lpResults, /* [in/out] A pointer to a GCP_RESULTSW struct */ + DWORD dwFlags /* [in] Flags specifying how to process the string */ + ) { DWORD ret=0; SIZE size; @@ -3144,66 +3144,69 @@ GetCharacterPlacementW( TRACE("lStructSize=%d, lpOutString=%p, lpOrder=%p, lpDx=%p, lpCaretPos=%p\n" "lpClass=%p, lpGlyphs=%p, nGlyphs=%u, nMaxFit=%d\n", - lpResults->lStructSize, lpResults->lpOutString, lpResults->lpOrder, - lpResults->lpDx, lpResults->lpCaretPos, lpResults->lpClass, - lpResults->lpGlyphs, lpResults->nGlyphs, lpResults->nMaxFit); - - if(dwFlags&(~GCP_REORDER)) FIXME("flags 0x%08x ignored\n", dwFlags); - if(lpResults->lpClass) FIXME("classes not implemented\n"); + lpResults->lStructSize, lpResults->lpOutString, lpResults->lpOrder, + lpResults->lpDx, lpResults->lpCaretPos, lpResults->lpClass, + lpResults->lpGlyphs, lpResults->nGlyphs, lpResults->nMaxFit); + + if(dwFlags&(~GCP_REORDER)) + FIXME("flags 0x%08x ignored\n", dwFlags); + if(lpResults->lpClass) + FIXME("classes not implemented\n"); if (lpResults->lpCaretPos && (dwFlags & GCP_REORDER)) FIXME("Caret positions for complex scripts not implemented\n"); - nSet = (UINT)uCount; - if(nSet > lpResults->nGlyphs) - nSet = lpResults->nGlyphs; + nSet = (UINT)uCount; + if(nSet > lpResults->nGlyphs) + nSet = lpResults->nGlyphs; - /* return number of initialized fields */ - lpResults->nGlyphs = nSet; + /* return number of initialized fields */ + lpResults->nGlyphs = nSet; - if((dwFlags&GCP_REORDER)==0 ) - { - /* Treat the case where no special handling was requested in a fastpath way */ - /* copy will do if the GCP_REORDER flag is not set */ - if(lpResults->lpOutString) - memcpy( lpResults->lpOutString, lpString, nSet * sizeof(WCHAR)); - - if(lpResults->lpOrder) - { - for(i = 0; i < nSet; i++) - lpResults->lpOrder[i] = i; - } - } else - { - BIDI_Reorder(NULL, lpString, uCount, dwFlags, WINE_GCPW_FORCE_LTR, lpResults->lpOutString, - nSet, lpResults->lpOrder, NULL, NULL ); - } + if((dwFlags&GCP_REORDER)==0 ) + { + /* Treat the case where no special handling was requested in a fastpath way */ + /* copy will do if the GCP_REORDER flag is not set */ + if(lpResults->lpOutString) + memcpy( lpResults->lpOutString, lpString, nSet * sizeof(WCHAR)); - /* FIXME: Will use the placement chars */ - if (lpResults->lpDx) - { - int c; - for (i = 0; i < nSet; i++) - { - if (GetCharWidth32W(hdc, lpString[i], lpString[i], &c)) - lpResults->lpDx[i]= c; - } - } + if(lpResults->lpOrder) + { + for(i = 0; i < nSet; i++) + lpResults->lpOrder[i] = i; + } + } + else + { + BIDI_Reorder(NULL, lpString, uCount, dwFlags, WINE_GCPW_FORCE_LTR, lpResults->lpOutString, + nSet, lpResults->lpOrder, NULL, NULL ); + } + + /* FIXME: Will use the placement chars */ + if (lpResults->lpDx) + { + int c; + for (i = 0; i < nSet; i++) + { + if (GetCharWidth32W(hdc, lpString[i], lpString[i], &c)) + lpResults->lpDx[i]= c; + } + } if (lpResults->lpCaretPos && !(dwFlags & GCP_REORDER)) { int pos = 0; - + lpResults->lpCaretPos[0] = 0; for (i = 1; i < nSet; i++) if (GetTextExtentPoint32W(hdc, &(lpString[i - 1]), 1, &size)) lpResults->lpCaretPos[i] = (pos += size.cx); } - + if(lpResults->lpGlyphs) - GetGlyphIndicesW(hdc, lpString, nSet, lpResults->lpGlyphs, 0); + GetGlyphIndicesW(hdc, lpString, nSet, lpResults->lpGlyphs, 0); if (GetTextExtentPoint32W(hdc, lpString, uCount, &size)) - ret = MAKELONG(size.cx, size.cy); + ret = MAKELONG(size.cx, size.cy); return ret; }

1 0

Alexandre Julliard : include: Force stack alignment also on Linux to work around the ABI breakage.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 4adfb787f4e8c36a37ce1d53a7e6df16d03ecd8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4adfb787f4e8c36a37ce1d53a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 15 16:49:47 2012 +0100 include: Force stack alignment also on Linux to work around the ABI breakage. --- include/windef.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/windef.h b/include/windef.h index 9cf98e7..eb59353 100644 --- a/include/windef.h +++ b/include/windef.h @@ -53,7 +53,7 @@ extern "C" { #ifndef __stdcall # ifdef __i386__ # ifdef __GNUC__ -# ifdef __APPLE__ /* Mac OS X uses a 16-byte aligned stack and not a 4-byte one */ +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) # define __stdcall __attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__)) # else # define __stdcall __attribute__((__stdcall__)) @@ -72,7 +72,7 @@ extern "C" { #ifndef __cdecl # if defined(__i386__) && defined(__GNUC__) -# ifdef __APPLE__ /* Mac OS X uses 16-byte aligned stack and not a 4-byte one */ +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) # define __cdecl __attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__)) # else # define __cdecl __attribute__((__cdecl__))

1 0

Alexandre Julliard : user32: Properly fixup font system parameters with positive height.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 71bb8c5e7c2373904a362a7a0afef7e7524a5b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71bb8c5e7c2373904a362a7a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 15 21:59:09 2012 +0100 user32: Properly fixup font system parameters with positive height. --- dlls/user32/sysparams.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index f17db6e..07795ba 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -915,9 +915,9 @@ static BOOL get_font_entry( union sysparam_all_entry *entry, UINT int_param, voi switch (load_entry( &entry->hdr, &font, sizeof(font) )) { case sizeof(font): - entry->font.val = font; if (font.lfHeight > 0) /* positive height value means points ( inch/72 ) */ font.lfHeight = -MulDiv( font.lfHeight, get_display_dpi(), 72 ); + entry->font.val = font; break; case sizeof(LOGFONT16): /* win9x-winME format */ SYSPARAMS_LogFont16To32W( (LOGFONT16 *)&font, &entry->font.val );

1 0

Alexandre Julliard : user32: Fix copy/paste typo.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 72b3dfca7c9026b6fe718e5392b0b654ad1a6253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72b3dfca7c9026b6fe718e539… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 17 14:12:02 2012 +0100 user32: Fix copy/paste typo. --- dlls/user32/sysparams.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 07795ba..5029902 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1126,8 +1126,8 @@ static BOOL set_entry( void *ptr, UINT int_param, void *ptr_param, UINT flags ) name ##_VALNAME }, data, sizeof(data) } #define PATH_ENTRY(name) \ - struct sysparam_binary_entry entry_##name = { { get_path_entry, set_path_entry, init_path_entry, \ - name ##_VALNAME } } + struct sysparam_path_entry entry_##name = { { get_path_entry, set_path_entry, init_path_entry, \ + name ##_VALNAME } } #define FONT_ENTRY(name,weight) \ struct sysparam_font_entry entry_##name = { { get_font_entry, set_font_entry, init_font_entry, \

1 0

Alexandre Julliard : fonts: Make Tahoma start at character 32.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 9d71d29f26a6f89d4e603c60e355d2ed39153b7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d71d29f26a6f89d4e603c60e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 17 14:04:28 2012 +0100 fonts: Make Tahoma start at character 32. --- fonts/tahoma.sfd | 2244 ++++++++++++++++++++++++++-------------------------- fonts/tahoma.ttf | Bin 101052 -> 100420 bytes fonts/tahomabd.sfd | 1720 ++++++++++++++++++++-------------------- fonts/tahomabd.ttf | Bin 92804 -> 92268 bytes 4 files changed, 1960 insertions(+), 2004 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d71d29f26a6f89d4e603…

1 0

Francois Gouget : testbot: Document the move of the ConfigLocal.pl file.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: tools Branch: master Commit: 180ef4eba16f09400fbe1ab9c1e1b8dabc84145f URL: http://source.winehq.org/git/tools.git/?a=commit;h=180ef4eba16f09400fbe1ab9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 09:57:23 2012 +0100 testbot: Document the move of the ConfigLocal.pl file. --- testbot/doc/INSTALL.txt | 4 ++-- testbot/lib/WineTestBot/Config.pm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 95b2a08..b780de0 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -49,8 +49,8 @@ General setup for the web site: - Install scripts/initd in /etc/init.d/winetestbot and adjust the paths and user name if necessary. Then activate it. (typically "chkconfig winetestbot on" or "service winetestbot start") -- Copy lib/WineTestBot/ConfigLocalTemplate.pl to - lib/WineTestBot/ConfigLocal.pl and fill in the options for your site. +- Copy lib/WineTestBot/ConfigLocalTemplate.pl to ConfigLocal.pl in TestBot's + root directory and fill in the options for your site. - Restart Apache, you should now be able to browse to the home page. - Register a new account for yourself. - Using the mysql client, set the ResetCode in your Users entry to a diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 8d96c36..bb1cabb 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -88,12 +88,12 @@ $JobArchiveDays = 0; if (!$::BuildEnv) { $::BuildEnv = 0; - eval 'require "$::RootDir/ConfigLocal.pl";'; + eval 'require "$::RootDir/ConfigLocal.pl"'; if ($@) { - print STDERR "Please create a valid $::RootDir/ConfigLocal.pl, " . + print STDERR "Please create a valid $::RootDir/ConfigLocal.pl file; " . "use $::RootDir/lib/WineTestBot/ConfigLocalTemplate.pl as template\n"; - exit; + exit 1; } require ObjectModel::DBIBackEnd;

1 0

Francois Gouget : testbot/build: Don' t force WineTestBot to be installed in the same location on the build VM and the WineTestBot server .
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: tools Branch: master Commit: 320347551427fb2998a7cd493c25393d855bbbb0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=320347551427fb2998a7cd49… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 10:01:24 2012 +0100 testbot/build: Don't force WineTestBot to be installed in the same location on the build VM and the WineTestBot server. --- testbot/bin/WineRunBuild.pl | 15 +++++++-------- testbot/bin/WineRunReconfig.pl | 8 +++----- testbot/doc/INSTALL.txt | 3 ++- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 9fd23a7..faf777e 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -237,14 +237,14 @@ if (defined($ErrMessage)) } my $FileName = $Step->FileName; $ErrMessage = $VM->CopyFileFromHostToGuest("$StepDir/$FileName", - "$DataDir/staging/$FileName"); + "staging/$FileName"); if (defined($ErrMessage)) { FatalError "Can't copy patch to VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } my $Script = "#!/bin/sh\n"; -$Script .= "$BinDir/build/Build.pl $FileName " . $Step->FileType . +$Script .= "../bin/build/Build.pl $FileName " . $Step->FileType . " $BaseName 32"; if ($Run64) { @@ -254,15 +254,14 @@ $Script .= "\n"; $ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout); if (defined($ErrMessage)) { - $VM->CopyFileFromGuestToHost("$LogDir/Build.log", - $FullRawlogFileName); + $VM->CopyFileFromGuestToHost("Build.log", $FullRawlogFileName); ProcessRawlog($FullRawlogFileName, $FullLogFileName, $FullErrFileName); FatalError "Failure running script in VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -$ErrMessage = $VM->CopyFileFromGuestToHost("$LogDir/Build.log", - $FullRawlogFileName); +$ErrMessage = $VM->CopyFileFromGuestToHost("Build.log", $FullRawlogFileName); +LogMsg "263 ErrMessage=[", $ErrMessage || "<undef>", "]\n"; if (defined($ErrMessage)) { FatalError "Can't copy log from VM: $ErrMessage\n", $FullErrFileName, @@ -285,11 +284,11 @@ foreach my $OtherStep (@{$Job->Steps->GetItems()}) my $TestExecutable; if ($Step->FileType ne "patchprograms") { - $TestExecutable = "$DataDir/build-mingw$Bits/dlls/$BaseName/tests/${BaseName}_test.exe"; + $TestExecutable = "build-mingw$Bits/dlls/$BaseName/tests/${BaseName}_test.exe"; } else { - $TestExecutable = "$DataDir/build-mingw$Bits/programs/$BaseName/tests/${BaseName}.exe_test.exe"; + $TestExecutable = "build-mingw$Bits/programs/$BaseName/tests/${BaseName}.exe_test.exe"; } $ErrMessage = $VM->CopyFileFromGuestToHost($TestExecutable, "$OtherStepDir/$OtherFileName"); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 47ac72e..4f86e10 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -198,19 +198,17 @@ if (defined($ErrMessage)) FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -my $Script = "#!/bin/sh\n$BinDir/build/Reconfig.pl\n"; +my $Script = "#!/bin/sh\n../bin/build/Reconfig.pl\n"; $ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout); if (defined($ErrMessage)) { - $VM->CopyFileFromGuestToHost("$LogDir/Reconfig.log", - $FullRawlogFileName); + $VM->CopyFileFromGuestToHost("Reconfig.log", $FullRawlogFileName); ProcessRawlog($FullRawlogFileName, $FullLogFileName, $FullErrFileName); FatalError "Failure running script in VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -$ErrMessage = $VM->CopyFileFromGuestToHost("$LogDir/Reconfig.log", - $FullRawlogFileName); +$ErrMessage = $VM->CopyFileFromGuestToHost("Reconfig.log", $FullRawlogFileName); if (defined($ErrMessage)) { FatalError "Can't copy log from VM: $ErrMessage\n", $FullErrFileName, diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index b780de0..f57ed17 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -144,7 +144,8 @@ Dependencies: - In the winehq account, run Reconfig.pl. Check $HOME/tools/testbot/log/Reconfig.log to make sure it succeeded. -- Start the TestAgent server: ./bin/build/testagentd PORT SRCHOST +- Start the TestAgent server from the var directory: + cd $HOME/tools/testbot/var && ../bin/build/testagentd PORT SRCHOST Where PORT is the $AgentPort that was configured in ConfigLocal.pl on the WineTestBot server, and SRCHOST is either omitted or the hostname of the WineTestBot server.

1 0

Francois Gouget : testbot/build: Log the Build.pl and Reconfig. pl scripts output.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: tools Branch: master Commit: 431982a0a3a6b9ace6fbac1ec7a3df12150f211f URL: http://source.winehq.org/git/tools.git/?a=commit;h=431982a0a3a6b9ace6fbac1e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 10:01:41 2012 +0100 testbot/build: Log the Build.pl and Reconfig.pl scripts output. This lets us capture Perl errors in case there are any. --- testbot/bin/WineRunBuild.pl | 14 ++++++-------- testbot/bin/WineRunReconfig.pl | 4 +++- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index faf777e..4cc7c89 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -243,14 +243,12 @@ if (defined($ErrMessage)) FatalError "Can't copy patch to VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -my $Script = "#!/bin/sh\n"; -$Script .= "../bin/build/Build.pl $FileName " . $Step->FileType . - " $BaseName 32"; -if ($Run64) -{ - $Script .= ",64"; -} -$Script .= "\n"; +my $Script = "#!/bin/sh\n" . + "rm -f Build.log\n" . + "../bin/build/Build.pl $FileName " . $Step->FileType . + " $BaseName 32"; +$Script .= ",64"if ($Run64); +$Script .= " >>Build.log 2>&1\n"; $ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout); if (defined($ErrMessage)) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 4f86e10..fa38a5f 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -198,7 +198,9 @@ if (defined($ErrMessage)) FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -my $Script = "#!/bin/sh\n../bin/build/Reconfig.pl\n"; +my $Script = "#!/bin/sh\n" . + "rm -f Reconfig.log\n" . + "../bin/build/Reconfig.pl >>Reconfig.log 2>&1\n"; $ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout); if (defined($ErrMessage)) {

1 0

Francois Gouget : testbot/WineRunTask: Don't force Windows VMs to have a c: \winetest directory.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: tools Branch: master Commit: 56ce6a39cc8808b75a8b6cfb52ea8158082fa8de URL: http://source.winehq.org/git/tools.git/?a=commit;h=56ce6a39cc8808b75a8b6cfb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 10:02:18 2012 +0100 testbot/WineRunTask: Don't force Windows VMs to have a c:\winetest directory. --- testbot/bin/WineRunTask.pl | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 8e7aeff..ccb2600 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -248,8 +248,7 @@ if ($FileType ne "exe32" && $FileType ne "exe64") $FullErrFileName, $Job, $Step, $Task; } my $FileName = $Step->FileName; -$ErrMessage = $VM->CopyFileFromHostToGuest("$StepDir/$FileName", - "C:\\winetest\\$FileName"); +$ErrMessage = $VM->CopyFileFromHostToGuest("$StepDir/$FileName", $FileName); if (defined($ErrMessage)) { FatalError "Can't copy exe to VM: $ErrMessage\n", @@ -259,20 +258,20 @@ my $TestLauncher = "TestLauncher" . ($FileType eq "exe64" ? "64" : "32") . ".exe"; $ErrMessage = $VM->CopyFileFromHostToGuest("$BinDir/windows/$TestLauncher", - "C:\\winetest\\$TestLauncher"); + $TestLauncher); if (defined($ErrMessage)) { FatalError "Can't copy TestLauncher to VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } $ErrMessage = $VM->CopyFileFromHostToGuest("$BinDir/windows/GenFixEnv.exe", - "C:\\winetest\\GenFixEnv.exe"); + "GenFixEnv.exe"); if (defined($ErrMessage)) { FatalError "Can't copy GenFixEnv to VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -my $Script = "\@echo off\r\ncd \\winetest\r\nset WINETEST_DEBUG=" . $Step->DebugLevel . +my $Script = "\@echo off\r\nset WINETEST_DEBUG=" . $Step->DebugLevel . "\r\n"; if ($Step->ReportSuccessfulTests) { @@ -313,8 +312,7 @@ $Script .= "cls\r\n"; $ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout + 15); my $LogErrMessage = RetrieveLogFile $Job, $Step, $Task, - "C:\\winetest\\$RptFileName", - $FullLogFileName; + $RptFileName, $FullLogFileName; TakeScreenshot $VM, $FullScreenshotFileName; if (defined($ErrMessage)) {

1 0