[BOOTDATA][BOOTCDREGTEST] Don't hardcode C:\ReactOS (#2346)

- Use %WINDIR% instead of C:\ReactOS.
- Quote paths.
CORE-14747
This commit is contained in:
Katayama Hirofumi MZ 2020-02-15 09:21:41 +09:00 committed by GitHub
parent 6ce72ba172
commit 78f5854348
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions

View file

@ -11,14 +11,14 @@ if "%errorlevel%"=="1" (
exit 0
)
move C:\ReactOS\bin\redirtest1.dll C:\ReactOS\bin\kernel32test_versioned.dll
move C:\ReactOS\bin\testdata\redirtest2.dll C:\ReactOS\bin\testdata\kernel32test_versioned.dll
if exist "C:\ReactOS\bin\AHKAppTests.cmd" (
move "%WINDIR%\bin\redirtest1.dll" "%WINDIR%\bin\kernel32test_versioned.dll"
move "%WINDIR%\bin\testdata\redirtest2.dll" "%WINDIR%\bin\testdata\kernel32test_versioned.dll"
if exist "%WINDIR%\bin\AHKAppTests.cmd" (
dbgprint "Preparing AHK Application testing suite."
call C:\ReactOS\bin\AHKAppTests.cmd
del C:\ReactOS\bin\AHKAppTests.cmd
call "%WINDIR%\bin\AHKAppTests.cmd"
del "%WINDIR%\bin\AHKAppTests.cmd"
)
dbgprint --process "ipconfig"
cd C:\ReactOS\bin
cd "%WINDIR%\bin"
start rosautotest /r /s /n

View file

@ -9,7 +9,6 @@ REM ECHO
REM START /WAIT abiword.exe
REM start /WAIT dbgprint.exe SYSREG_CHECKPOINT:ABIWORD_INSTALL_COMPLETE
REM ECHO
REM ECHO Installing OpenOffice
REM ECHO
@ -19,10 +18,9 @@ REM start /WAIT dbgprint.exe SYSREG_CHECKPOINT:OPENOFFICE_INSTALL_COMPLETE
ECHO
ECHO Informing Sysreg that we are done
ECHO
START C:\ReactOS\bin\dbgprint.exe SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE
START dbgprint.exe SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE
ECHO
ECHO Shutting down ReactOS
ECHO
START shutdown.exe shutdown