https://git.reactos.org/?p=reactos.git;a=commitdiff;h=78f5854348e4b746f7d03deb17af09ad592a50c0
commit 78f5854348e4b746f7d03deb17af09ad592a50c0 Author: Katayama Hirofumi MZ <[email protected]> AuthorDate: Sat Feb 15 09:21:41 2020 +0900 Commit: GitHub <[email protected]> CommitDate: Sat Feb 15 09:21:41 2020 +0900 [BOOTDATA][BOOTCDREGTEST] Don't hardcode C:\ReactOS (#2346) - Use %WINDIR% instead of C:\ReactOS. - Quote paths. CORE-14747 --- boot/bootdata/bootcdregtest/regtest.cmd | 12 ++++++------ boot/bootdata/bootcdregtest/testboot.bat.sample | 4 +--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/boot/bootdata/bootcdregtest/regtest.cmd b/boot/bootdata/bootcdregtest/regtest.cmd index ec263e13241..1f71cdd98eb 100644 --- a/boot/bootdata/bootcdregtest/regtest.cmd +++ b/boot/bootdata/bootcdregtest/regtest.cmd @@ -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 diff --git a/boot/bootdata/bootcdregtest/testboot.bat.sample b/boot/bootdata/bootcdregtest/testboot.bat.sample index 884f265d98c..8cef6e53d69 100644 --- a/boot/bootdata/bootcdregtest/testboot.bat.sample +++ b/boot/bootdata/bootcdregtest/testboot.bat.sample @@ -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 -
