Windows unit test: Merge branch 'TinCanTech-master'

On error then exit with error Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
OpenVPN · Mar 23, 2022 · 258ec44 · 258ec44
2 parents 39b06f1 + ba11ec0
commit 258ec44
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/wop_test.bat b/wop_test.bat
@@ -19,16 +19,19 @@ copy  "%WORK_DIR%\distro\windows\EasyRSA-Start.bat" "%WORK_DIR%\easyrsa3\EasyRSA
 PATH=%PATH%;%WORK_DIR%\easyrsa3\bin;C:\PROGRA~1\openssl
 
 cmd /C "easyrsa3\bin\sh.exe wop_test.sh"
-IF ERRORLEVEL 0 (
+IF ERRORLEVEL 1 (
+	echo Error occurred, Exit 1
+	exit /B 1 )
+
+REM Success ..
 	IF %SAVE_LAYOUT% EQU 0 (
 		echo rmdir /S /Q "%WORK_DIR%\easyrsa3\bin"
 		rmdir /S /Q "%WORK_DIR%\easyrsa3\bin"
 		echo del /Q "%WORK_DIR%\easyrsa3\EasyRSA-Start.bat"
 		del /Q "%WORK_DIR%\easyrsa3\EasyRSA-Start.bat"
-		echo rm "%WORK_DIR%\easyrsa3\.rnd"
-		rm "%WORK_DIR%\easyrsa3\.rnd"
+		REM echo del "%WORK_DIR%\easyrsa3\.rnd"
+		REM del /Q "%WORK_DIR%\easyrsa3\.rnd"
 	) ELSE echo NOTICE; Saved Layout
-) ELSE echo Error occurred, no clean up
 
 set SAVE_LAYOUT=
 set SYS_ARCH=