Skip to content

Commit 3ea3a49

Browse files
bugfix of test batch.
1 parent f0d93f8 commit 3ea3a49

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

tools/test/releasetest/releasetest.bat

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@echo off
1+
@echo on
22
@setlocal
33

44
set BASEDIR=%~dp0
@@ -16,11 +16,20 @@ if not "%TFENV%" == "" (
1616
call "..\..\..\tfenv.bat"
1717
)
1818

19+
for %%I in (nmake.exe) do if exist %%~$path:I set NMAKE=%%~$path:I
1920
for %%I in (qmake.exe) do if exist %%~$path:I set QMAKE=%%~$path:I
2021
for %%I in (cmake.exe) do if exist %%~$path:I set CMAKE=%%~$path:I
2122
for %%I in (sqlite3.exe) do if exist %%~$path:I set SQLITE=%%~$path:I
2223
if "%SQLITE%" == "" for %%I in (sqlite3-bin.exe) do if exist %%~$path:I set SQLITE=%%~$path:I
2324

25+
if "%NMAKE%" == "" (
26+
echo;
27+
echo nmake.exe command not found.
28+
call :CleanUp
29+
pause
30+
exit /B 1
31+
)
32+
2433
if "%QMAKE%" == "" (
2534
echo;
2635
echo qmake.exe command not found.
@@ -29,6 +38,7 @@ if "%QMAKE%" == "" (
2938
exit /B 1
3039
)
3140

41+
3242
cd /D %BASEDIR%
3343
rd /Q /S %APPNAME%
3444
tspawn new %APPNAME%

tools/tfmanager/servermanager.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@ void ServerManager::setupEnvironment(QProcess *process)
196196
tSystemDebug("export %s=%s", "LD_PRELOAD", qPrintable(preload));
197197
}
198198
process->setProcessEnvironment(env);
199+
#else
200+
Q_UNUSED(process);
199201
#endif
200202
}
201203

0 commit comments

Comments
 (0)