testbot/WineRunTask: GenFixEnv.exe is not needed anymore so remove it.
Francois Gouget
fgouget at codeweavers.com
Sun Mar 24 17:38:42 CDT 2013
TestAgentd runs in a normal user account so the environment is already set up.
---
testbot/bin/WineRunTask.pl | 7 --
testbot/bin/windows/GenFixEnv.exe | Bin 7680 -> 0 bytes
testbot/src/GenFixEnv/GenFixEnv.c | 164 -------------------------------------
testbot/src/GenFixEnv/Makefile | 10 ---
4 files changed, 181 deletions(-)
delete mode 100755 testbot/bin/windows/GenFixEnv.exe
delete mode 100644 testbot/src/GenFixEnv/GenFixEnv.c
delete mode 100644 testbot/src/GenFixEnv/Makefile
diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index abb92e0..57a4537 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -241,19 +241,12 @@ if (!$TA->SendFile("$BinDir/windows/$TestLauncher", $TestLauncher, 0))
FatalError "Can't copy TestLauncher to VM: $ErrMessage\n",
$FullErrFileName, $Job, $Step, $Task;
}
-if (!$TA->SendFile("$BinDir/windows/GenFixEnv.exe", "GenFixEnv.exe", 0))
-{
- $ErrMessage = $TA->GetLastError();
- FatalError "Can't copy GenFixEnv to VM: $ErrMessage\n",
- $FullErrFileName, $Job, $Step, $Task;
-}
my $Script = "\@echo off\r\nset WINETEST_DEBUG=" . $Step->DebugLevel .
"\r\n";
if ($Step->ReportSuccessfulTests)
{
$Script .= "set WINETEST_REPORT_SUCCESS=1\r\n";
}
-$Script .= "GenFixEnv FixEnv.bat\r\ncall FixEnv.bat\r\ndel FixEnv.bat\r\n";
if ($Step->Type eq "single")
{
$Script .= "$TestLauncher -t " . $Task->Timeout . " $FileName ";
diff --git a/testbot/bin/windows/GenFixEnv.exe b/testbot/bin/windows/GenFixEnv.exe
deleted file mode 100755
index b2e7d3c6789f210bdf1cca061fa867cfe2692cf5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 7680
zcmeHMeQZ<L6~8tH3>X|uNedkmLrn)72{9inT?w*r3;`T4aiElsCMJH4O&vS4pCLhX
z4RfBvo98YYY^^j<F|dkFtfLhzA$-&jMu^r{8S6Sa)QPsBy)>CbDN0#K>;2AsFCTOt
ze at xS+Zai_`Irp4%&(}To_yOhXTG%kgm;sQ>G1dx9kDb5&`Kt-yag*D|v7 at 8jn9{0q
zzcHmU7>Zl!W6|1}ug+5Ai$tQLWs_iuB_ftk#8SG_YpIL+g`%-zM_V=19v5S7-Eh`y
zoKW8H?Fusw8>7?DXL;b<2hcM%@hiZzwg4zPqQR%QbpXQrsm2?No#z<Oi*F!Z+Q9Ju
zA|_)V=niaFS^tT5ktj5XaAX*V7sW;Jg*d92r at F}R6MYa_0X%o)%<^e5_}E!-wkW14
zlDrr|_?|%>qU@~NUbHD5Cz_wLov6QknwULX6jJT++Mq^k1YrD~y5#px&fV3Qtpcm%
zYiqnImodds%y!w<SMq(vvRfS`X`tAe({#0xy~fRKvr&1;1o~WF@|I2%rL1U9_L?>u
zb6qELc)(8!x8zIfpXfYmVCgNaWH$_m=e9aab`kOF5NS)vaAG}PG6^VgK{ansDhAE_
zVg3l2H}pJDwtfV~p5Kz94spy-6{Wt!Nbb8wQeHGN#_8 at Y6buh|jKT&jJ|Jby&Fi?#
zw0TVTVogi8*`WM>3}f974=~0koy2$$4AjP(?6m}0o}DRkxG|Hmek5bcLij^`Y1gd|
z*DX47Pi`Kw*jd_j(-UNNI|~}{Ql5pSj1g4woCPT at PZiX!vNP%80Rwc+QWF*T(<|bA
z2sk&7^m4IcWgRx5oT_f})2x_3MC?%>RmIBJfl~!!NX}FC<8~&mURSme?#)v^A5At)
zxnhJxX6Ny6$e-M<yaS;;(W*QS3oWqi$;I-Nt9*y%wL5_911-ou*_*#vmn-liY~@d%
z=W_i#y~cY-<E6$nL8UYI9`>ZhiYg6v4C{^E9jIB0`mAoHK__2(Y>jtEZy3Xm!oC;I
zmDA{o<WokySsD$hl@%kiQmY~5GNtSW*<e)~DQ at ZHN4Xpw<{KE6DZc73SoKhTZLGS(
z)CxV?YHX$MB^$~;v~|1Hke1%UcChmLWhPseRAB?kP0BB!h at 9a-@`7ROlV54Yj-LFS
zL^vfKRozRZew+q&`cxNKC+J5=-g^OLT2emE<!l$_Gzs8!V*1qUM3q{{rzO$=FF$=s
zLFwd5YaaL}aEvML0V_jFjS?vr at s!CY`jCQ3;9yb`nM>Z%o0~t;GgfAns=&S7Isy3~
zN9kDl6>huZ;}^vHTJI+={jdyj%~Caf@>_ZIdzBjq`4ojLFR)T6<P9j8G>YnALM{{~
z)p9CTcLPGD08h~=Kwo(m7vT$~X}(5V`qC%A2B$b8UUB5Ij+-=~(z9UdwFP)7_ozI%
z9o%wae8w-9K|YTLr2|v0a)$Bv<K(_wo@<re;J&GHrOW2sXQixs-n=_Is_T%>+`JDi
zVJimh6W=0(hX)KIE$X6O+SaVxZf>4{`a%7B&}=i{1k<N3QDT*-0y$s8bxqW6b~<11
zT1kxxf^E-|g9iq6UV?K(sEh|oZOvpa_xU{fKP}v}W!FDZwXt0>LXJ?<KRl;7YXgJ9
zt0DIr6rJ47$BCw;Eaa~Z9+P~E82x9IlK6ImHTSl*X&5%)h>WKXA~0E`M&jp$tmh$u
zfep&jSRu6Ti*!=kt$DVrtrKQVZ4)UDH?l`8NDwPVA<=!<IhCxVPg~o_`W;>HJB%Gl
zd@}b!KDESOfM76j)fG8XFI_8r+mWR&y4t12Wo-R*zpH^n!m!vKhg at ynQ%WDA`W!}#
z>b;{g(%KnmpNIBs`OKMa{l`B+kq+tQv+`d=llj<)WV=3jULTN0_MO#<!_BXb*f~rc
z3H)+(zjzyFkx at AeAQuGq0Uh=e>hd_X7J3w|NG)aOTq7E>-7Nk5vs|vb4=*(y?VclN
z^#-AUymkW#{TMg4`#9Xe$93|t4Ghp|Gp1|-ouS{1HvCpnhfv#%vDsNNYo|K)Pcefs
z7n(g6TGaV$%oy>zketuNdvh4+v`8;9q$&&th?FiSx;xwPyGp-r-put$P`#BCr&0Xk
zSnzZCdx^O`(TAD^yY59$6EGiA8*g{E+p@`$n-H>|F)j9#Ng`V6Ox)}_gWroxo*k>K
zd`&cTwg*}|hSQo7>Fn8s at ehB;*=#%O$qTfkRvA({-M8tZG<n9j<Ilv8ec0JfG40v2
zR&Jk1pSzyDd)Dr?UHU1}=H|n&WXqcO(*@ZFnrCm`-*;YTmhid30 at B6Ck;$<ZIMsi0
z7UP_W+R{Kvrt4oC`BLA%%-iukq=x>brSHsuroHK!MI60 at +iZdoeKt3l_m>dbGMNIv
zO1ju!<tFT+NmZq<??B7?&h{2H99?%cZjUCzrk*b3dHDm#S7#dR=%s5LQ)PzSd#GXC
zBG^U|%*V3HUOydqdi5dOWxA2nYqv4E`E_rb487y9#S$ZXN_3se8pbtkFF52#+#K~Q
ztQv15AFWJ`lrQm9L)ZAxHEo|jy>&MzvP*ra%!EBiyTCi~5n1F?3=uwO$3dDt`XKmB
zo9Bp||8$=OD^)_VOF7YqJI+U2hwC{9o{Syl(oa3t;o3vX4%a?Hva2;y3PFeKpvpa@
za!+Q;IQOv1J)&~688_!1RhQ>79xP?og-j*KuV>bB+?CnD at muC&!>d6BWY;D7VY-SF
z;3YJmTcmo_30YPmXk{5B{HiuT11 at T6>pV>Yew#(BQF#Ok9Zo|TI-A$G!)a`qU}u@>
zNVa1bsiq2M678H0n#s=mjLCx7yyH^^c|<rTX6AGGOdNVn_F80TaV8&<RKa*IpPMOz
zT=vdS6}X9TF379}?r at f>8|<>PELC8EZe}80ve&~;TXwoz<V#a7;0t_0)@spp8XP;D
z3(Bx(S>qph&1ETw6|b@^g^8rn%2GX%R8LtFiR87E8i?fOl(rM8R<ud0X!Br2ccvxs
zLjBi_nwgJX$4tccx5IW3!(<YDO!iVGQ1>w85Tf*o4MPw=*^{VA(oVyHAjif7I|*wI
zBVSiWL+z1E@{PpHJufS-z>M~#sG?Q!dzcR;^w;B9-i~g<$x*D3a8LJ)Goa-w^6M!h
zz7ca*uq8Jwyvhy}xoI0Td`QF98g9_=S`9y^;hh>jsNrS}w`lmg8V+iBw}$s<c)N!8
zY1pD+w}$6yc&3IYYIv at O?HVrA at B$5&YS^mbVhxYi at N^9uG;GwciDTT?jon*s;>%rq
zaE!StG{5l>&566O|Jw at i9<U?*`{^~<6aBr>kGb&f>wm5STbW&`2}Ui^Kwva;MYe=u
z(MX*T5m}|H+`}pXURR}M>a=*twD{D~%;(?Ys}IeYUE~jk*~)q$;)z9Tgm}C%`lJwH
ziMS9GB3rm{i6E}V67oPOER=>~LX8-WH9A;4D1^hB1#cPD7DvN=DEh>pgE>5&Qb(nO
zxmP+J?*0XjV71p(;i*`;c&Xc^hQhf+^@gyuohm0D3~&!Ttkn_Urm$cUkujpTL=$3t
zLbOnbY<1jMD}2MUM2IX7HJ}uh1&e%QO>i+}3+bN}{_a!gUb<+B)A`t(*@dpM!a0TB
zW$tB#ODfAM3d@(SSOPY7ZJjf_DjxL31b at 94D_j^4Z4)ddB^JWbz;x(Txyq`%WsVA0
z=?rpGR5S~JYHMl==M>E?npZfxxcH%Bo9*Gk*~FYx6O9BywX;HV=07wGrVCZmg|J;z
z!%$C$7_D33s}mfS={}G%Ephx&eZ^<YuuLhj6c46S=^3QEy!Z-U#aM6%Z#=$t#)Efg
z2yZ)hYr*?R&k at K@1Ku2>^9Rr$0&W3DR4_IbPy|>2a099V+W^l1_5qFp&H?(L_d(wP
z=n-QcU at BlH;32?5KpCJCumKPNL;wwdCct+9KLG3jyZ|@?Xan>=U#57!t*a1fo#AL)
zSS~cO-L!H=5_M~Q;e_B|dudJA5<*vl1Aq5&`2Exm4#pm2d|R0>;zzUZVXlUdsNG)n
zJXZA(3>g4kF&2u{#vSYkTO5jLM&4$NV}jrgZHoC~jqKe!x{a}~>d<}8L<}=v!165O
z4KcgM7Yor1bg)$<DUbRSVL^=vF@}jpK_ToI#tP1lINo41Cenc5ZOu%2chu+CqQI^X
z^j-{`NRVgdcQw=q^<pTBTO1aJ7<-siRn-b&oi7ye#cJcM9P9e3D$FUGb&Rc4*8%#U
zDaLBBiVI?uufD!YY^(=IW>vm8CYi`~v8oyYRby<lt|}DW#Mslis%V6>ex{>ss*NRj
z-zEgiR_J~BUmnumpjUB~K2Sqv$Jl0lfCdnIQXi;Cp~V3Erapk$GS;XMY>kCPPzUvO
zzHm5N!`NYcolpn+jQv7iFT`Te7-MJk at lb8V7e*J;-PFKQy2jyIit$?Nc2j at nga5C<
ia#zI)ms=aturnQY{@qX)-%=A3`B<h<?>_&93j7tc;h9DN
diff --git a/testbot/src/GenFixEnv/GenFixEnv.c b/testbot/src/GenFixEnv/GenFixEnv.c
deleted file mode 100644
index 8272eb6..0000000
--- a/testbot/src/GenFixEnv/GenFixEnv.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Generates a batch file that sets up the environment.
- * This can be used in case the mechanism for running a process in the VM
- * does not properly set up the environment for the currently logged in user.
- *
- * Copyright 2009 Ge van Geldorp
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include <stdio.h>
-#include <windows.h>
-#include <shlobj.h>
-
-static void GenerateFromReg(FILE *BatchFile)
-{
- LONG Err;
- HKEY UserEnvironment;
- DWORD Index;
- char ValueName[256];
- DWORD ValueNameSize;
- DWORD Type;
- char Data[1024];
- DWORD DataSize;
-
- Err = RegOpenKeyExA(HKEY_CURRENT_USER, "Environment", 0, KEY_QUERY_VALUE,
- &UserEnvironment);
- if (Err != ERROR_SUCCESS)
- return;
-
- Index = 0;
- do
- {
- ValueNameSize = sizeof(ValueName);
- DataSize = sizeof(Data);
- Err = RegEnumValueA(UserEnvironment, Index, ValueName, &ValueNameSize,
- NULL, &Type, (LPBYTE) Data, &DataSize);
- if (Err == ERROR_SUCCESS)
- {
- if (Type == REG_EXPAND_SZ)
- {
- char Expanded[sizeof(Data)];
- DWORD ExpandedSize;
- ExpandedSize = ExpandEnvironmentStringsA(Data, Expanded,
- sizeof(Expanded));
- memcpy(Data, Expanded, ExpandedSize);
- Type = REG_SZ;
- }
- if (Type == REG_SZ)
- {
- if (strcmp(ValueName, "TEMP") != 0 && strcmp(ValueName, "TMP") != 0)
- fprintf(BatchFile, "SET \"%s=%s\"\n", ValueName, Data);
- else
- {
- char Short[sizeof(Data)];
- GetShortPathNameA(Data, Short, sizeof(Short));
- fprintf(BatchFile, "SET \"%s=%s\"\n", ValueName, Short);
- }
- }
- }
- Index++;
- }
- while (Err == ERROR_SUCCESS);
-
- RegCloseKey(UserEnvironment);
-}
-
-static void GenerateUserProfile(FILE *BatchFile)
-{
- BOOL (WINAPI *pOpenProcessToken)(HANDLE,DWORD,PHANDLE);
- BOOL (WINAPI *pGetUserProfileDirectoryA)(HANDLE,LPSTR,LPDWORD);
- HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll");
- HMODULE huserenv = LoadLibraryA("userenv.dll");
- HANDLE Token;
- char Data[1024];
- DWORD DataSize;
-
- pOpenProcessToken = (void *)GetProcAddress(hadvapi32, "OpenProcessToken");
- pGetUserProfileDirectoryA = (void *)GetProcAddress(huserenv,
- "GetUserProfileDirectoryA");
- if (pOpenProcessToken == NULL || pGetUserProfileDirectoryA == NULL)
- return;
-
- if (! pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &Token))
- return;
- DataSize = sizeof(Data);
- if (! pGetUserProfileDirectoryA(Token, Data, &DataSize))
- return;
- fprintf(BatchFile, "SET \"USERPROFILE=%s\"\n", Data);
- CloseHandle(Token);
-}
-
-static void GenerateCSIDL(FILE *BatchFile)
-{
- char Path[_MAX_PATH];
- HMODULE Mod;
- HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR);
- HRESULT Res;
-
- Mod = LoadLibraryA("shell32.dll");
- pSHGetFolderPathA = (void *) GetProcAddress(Mod, "SHGetFolderPathA");
- if (pSHGetFolderPathA == NULL)
- {
- FreeLibrary(Mod);
- Mod = LoadLibraryA("shfolder.dll");
- pSHGetFolderPathA = (void *) GetProcAddress(Mod, "SHGetFolderPathA");
- }
- if (pSHGetFolderPathA != NULL)
- {
- if (GetEnvironmentVariable("APPDATA", Path, sizeof(Path)) == 0)
- {
- Res = pSHGetFolderPathA(NULL, CSIDL_APPDATA, NULL,
- SHGFP_TYPE_CURRENT, Path);
- if (SUCCEEDED(Res))
- fprintf(BatchFile, "SET \"APPDATA=%s\"\n", Path);
- }
- if (GetEnvironmentVariable("LOCALAPPDATA", Path, sizeof(Path)) == 0)
- {
- Res = pSHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL,
- SHGFP_TYPE_CURRENT, Path);
- if (SUCCEEDED(Res))
- fprintf(BatchFile, "SET \"LOCALAPPDATA=%s\"\n", Path);
- }
- }
- FreeLibrary(Mod);
-}
-
-int main(int argc, char *argv[])
-{
- FILE *BatchFile;
- if (argc != 2)
- {
- fprintf(stderr, "Usage: GenFixEnv <BatchFile>\n");
- exit(1);
- }
-
- BatchFile = fopen(argv[1], "w");
- if (BatchFile == NULL)
- {
- perror("Unable to open output file");
- exit(1);
- }
-
- fprintf(BatchFile, "@echo off\n");
- GenerateFromReg(BatchFile);
- GenerateUserProfile(BatchFile);
- GenerateCSIDL(BatchFile);
-
- fclose(BatchFile);
-
- return 0;
-}
diff --git a/testbot/src/GenFixEnv/Makefile b/testbot/src/GenFixEnv/Makefile
deleted file mode 100644
index a485094..0000000
--- a/testbot/src/GenFixEnv/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-bindir = ../../bin/windows
-
-CROSSCC32 = i686-w64-mingw32-gcc
-CROSSSTRIP32 = i686-w64-mingw32-strip
-
-all: $(bindir)/GenFixEnv.exe
-
-$(bindir)/GenFixEnv.exe: GenFixEnv.c
- $(CROSSCC32) -Wall -o $@ $<
- $(CROSSSTRIP32) $@
--
1.7.10.4
More information about the wine-patches
mailing list