Author: cfinck
Date: Mon Jan 5 06:48:59 2009
New Revision: 38581
URL:
http://svn.reactos.org/svn/reactos?rev=38581&view=rev
Log:
Supersede the current way for running automatic regression tests for real now and switch
to rosautotest. No more sights of hardcoded regression test stuff inside syssetup :-)
Works well here, let's hope BuildBot is with me ;-)
Still, there seems to be a bug in our OutputDebugString function, adding a newline at the
end of the debug output automatically.
Getting the OutputDebugString output through MSVC doesn't lead to this behaviour, that
bug needs to be evaluated in detail later.
Modified:
trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf
trunk/reactos/boot/bootdata/packages/reactos.dff
trunk/reactos/dll/win32/syssetup/globals.h
trunk/reactos/dll/win32/syssetup/wizard.c
Modified: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes…
==============================================================================
--- trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] Mon Jan 5
06:48:59 2009
@@ -45,12 +45,10 @@
; yes - disabled
; no - enabled
DisableVmwInst = yes
-LocaleID = 407
-BootCDRegTestActive = 1
+LocaleID = 409
; enable this section to automatically launch programs
; after 3rd boot
;
-; [GuiRunOnce]
-; %SystemRoot%\system32\cmd.exe
-
+[GuiRunOnce]
+%SystemRoot%\system32\rosautotest.exe /s
Modified: trunk/reactos/boot/bootdata/packages/reactos.dff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea…
==============================================================================
--- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Jan 5 06:48:59
2009
@@ -618,6 +618,8 @@
modules\rosapps\dflat32\edit.exe 1 optional
modules\rosapps\drivers\green\green.sys 2 optional
modules\rosapps\templates\dialog\dialog.exe 1 optional
+
+modules\rostests\rosautotest\rosautotest.exe 1 optional
modules\rostests\tests\pseh2\pseh2_test.exe 7 optional
modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional
modules\rostests\winetests\advpack\advpack_winetest.exe 7 optional
@@ -668,6 +670,7 @@
modules\rostests\winetests\wininet\wininet_winetest.exe 7 optional
modules\rostests\winetests\wintrust\wintrust_winetest.exe 7 optional
modules\rostests\winetests\ws2_32\ws2_32_winetest.exe 7 optional
+
modules\wallpaper\lake.bmp 4 optional
; Native libraries
Modified: trunk/reactos/dll/win32/syssetup/globals.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/globals…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] Mon Jan 5 06:48:59 2009
@@ -47,7 +47,6 @@
WCHAR AdminPassword[15]; /* max. 14 characters */
BOOL UnattendSetup;
BOOL DisableVmwInst;
- DWORD BootCDRegtestActive;
SYSTEMTIME SystemTime;
PTIMEZONE_ENTRY TimeZoneListHead;
Modified: trunk/reactos/dll/win32/syssetup/wizard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Mon Jan 5 06:48:59 2009
@@ -2132,10 +2132,6 @@
else
SetupData.DisableVmwInst = 0;
}
- else if (!wcscmp(szName, L"BootCDRegTestActive"))
- {
- SetupData.BootCDRegtestActive = _wtoi(szValue);
- }
}
while (SetupFindNextLine(&InfContext, &InfContext));
@@ -2187,55 +2183,6 @@
}while(SetupFindNextLine(&InfContext, &InfContext));
}
- if (SetupData.BootCDRegtestActive)
- {
- char szPath[MAX_PATH];
- FILE * file;
- WIN32_FIND_DATAA ffd;
- HANDLE hFind = INVALID_HANDLE_VALUE;
-#if 0
- if (!SHGetSpecialFolderPathA(0, szPath, CSIDL_DESKTOP, FALSE))
- {
- /* failed to get desktop path */
- strcpy(szPath, "C:");
- }
- strcat(szPath, "\\sysregtest.bat");
-#else
- strcpy(szPath, "C:\\sysregtest.bat");
-#endif
- file = fopen(szPath, "w+");
- if (!file)
- {
- DPRINT1("Error: failed create sysregtest.bat");
- RegCloseKey(hKey);
- return TRUE;
- }
-
- RegSetValueExA(hKey,
- "BootCDRegtestActive",
- 0,
- REG_SZ,
- (const BYTE*)szPath,
- (strlen(szPath)+1) * sizeof(char));
-
-
- /* winetests */
- hFind = FindFirstFileA("c:\\reactos\\bin\\*.exe", &ffd); /* %windir%
isn't working on ros */
- if (hFind != INVALID_HANDLE_VALUE)
- {
- do
- {
- if (ffd.dwFileAttributes & ~FILE_ATTRIBUTE_DIRECTORY)
- fprintf(file, "%s%s\n", "dbgprint --winetest
%windir%\\bin\\", ffd.cFileName);
- }
- while (FindNextFileA(hFind, &ffd) != 0);
- FindClose(hFind);
- }
-
- fprintf(file, "%s\n", "dbgprint
SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE");
- fprintf(file, "%s\n", "shutdown -s");
- fclose(file);
- }
RegCloseKey(hKey);
return TRUE;
}