From 434a810e749d39b93b1d52d97daf6cb36151b1df Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers3@gmail.com>
Date: Sat, 20 Feb 2016 22:54:13 -0600
Subject: [PATCH] win32-test-imagex-capture_and_apply: eliminate unnecessary
 %errorlevel% checks

---
 tests/win32-test-imagex-capture_and_apply.bat | 68 +------------------
 1 file changed, 1 insertion(+), 67 deletions(-)

diff --git a/tests/win32-test-imagex-capture_and_apply.bat b/tests/win32-test-imagex-capture_and_apply.bat
index 6ef76513..f4e23ce0 100644
--- a/tests/win32-test-imagex-capture_and_apply.bat
+++ b/tests/win32-test-imagex-capture_and_apply.bat
@@ -25,48 +25,40 @@ REM
 
 call :msg "empty directory"
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "single file"
 echo 1 > file
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "different files"
 echo 1 > file
 echo 2 > anotherfile
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "identical files"
 echo 1 > file
 echo 1 > identicalfile
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "hard linked file"
 echo 1 > file
 mklink /h link file > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "hard linked file, with other identical files"
 echo 1 > file
 mklink /h link file > nul
 echo 1 > identicalfile
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "empty file"
 type nul > emptyfile
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "hard linked empty file"
 type nul > file
 mklink /h link file > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "various hard linked, identical, different, and empty files"
 echo 1 > file
@@ -80,7 +72,6 @@ echo 5 > identicalfile
 echo 1 > 1file
 mklink /h 1filelink 1file > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "multiple subdirectories, some empty, some not"
 md subdir1
@@ -92,25 +83,21 @@ mklink /h link subdir1\1 > nul
 md subdir2\subdir2subdir
 type nul > subdir2\emptyfile
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "file with custom security descriptor"
 echo hello > file
 icacls file /deny Administrator:F > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "directory with custom security descriptor (inheritence enabled)"
 md subdir
 icacls subdir /inheritance:e > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "directory with custom security descriptor (inheritence disabled)"
 md subdir
 icacls subdir /inheritance:d > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 REM            win32-tree-cmp can't handle this case.
 REM
@@ -118,46 +105,38 @@ REM call :msg "file with custom security descriptor (all inherited ACEs removed)
 REM echo hello > file
 REM icacls file /inheritance:r > nul
 REM call :do_test
-REM if %errorlevel% neq 0 goto :fail
 
 call :msg "file with custom integrity level"
 echo hello > file
 icacls file /setintegritylevel H > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "relative symlink"
 mklink relink dest > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "absolute symlink, with drive letter"
 mklink abslink C:\absolute\target > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "absolute symlink, without drive letter"
 mklink abslink \absolute\target > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "relative symlink, with file target"
 echo 1 > 1
 mklink relink 1 > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "relative symlink, with directory target"
 md subdir
 mklink reldlink subdir > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "junction"
 md subdir
 mklink /j junction subdir > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "symlinks, junctions, files, subdirectories, etc."
 echo 1 > 1
@@ -177,13 +156,11 @@ md subdir2\s\s
 md subdir2\s\s\s
 echo "hello world!!!!" > subdir2\otherfile
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "reparse point that is neither a symlink nor a junction"
 type nul > file
 %SET_REPARSE_POINT% file
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "reparse point with named data streams"
 type nul > file
@@ -191,13 +168,11 @@ echo 11 > file:a
 echo 1 > file:aa
 %SET_REPARSE_POINT% file
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "reparse point with unnamed data stream"
 echo "test" > file
 %SET_REPARSE_POINT% file
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "reparse point with unnamed data stream and named data streams"
 echo "test" > file
@@ -205,19 +180,16 @@ echo 11 > file:a
 echo 1 > file:aa
 %SET_REPARSE_POINT% file
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "empty reparse point"
 type nul > file
 %SET_REPARSE_POINT% file 0
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "empty reparse point with unnamed data stream"
 echo hello > file
 %SET_REPARSE_POINT% file 0
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "empty reparse point with unnamed data stream and named data streams"
 echo hello > file
@@ -225,19 +197,16 @@ echo hello > file:ads1
 type nul > file:ads2
 %SET_REPARSE_POINT% file 0
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "maximum length reparse point"
 type nul > file
 %SET_REPARSE_POINT% file 16376
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "directory reparse point that is neither a symlink nor a junction"
 md subdir
 %SET_REPARSE_POINT% subdir
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "directory reparse point with named data streams"
 md subdir
@@ -245,19 +214,16 @@ echo 11 > subdir:a
 echo 1 > subdir:aa
 %SET_REPARSE_POINT% subdir
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "compressed file"
 echo "test" > test
 compact /C test > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "compressed directory"
 md subdir
 compact /C subdir > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "compressed directory with files in it"
 md subdir
@@ -269,7 +235,6 @@ md subdir\subsubdir
 mklink /h subdir\hardlink subdir\file1 > nul
 mklink /j subdir\j subdir\subsubdir > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "compressed directory with some uncompressed files in it"
 md subdir
@@ -278,13 +243,11 @@ echo 1 > subdir\1
 echo 5 > subdir\5
 compact /U subdir\1 > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "file with alternate data stream"
 echo 1 > file
 echo 5 > file:ads
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "file with multiple alternate data streams"
 echo 1 > file
@@ -293,7 +256,6 @@ echo aa > file:aa
 echo aaa > file:aaa
 echo aaaa > file:aaaa
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "file with multiple alternate data streams, with hard link"
 echo 1 > file
@@ -303,7 +265,6 @@ echo aaa > file:aaa
 echo aaaa > file:aaaa
 mklink /h link file > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "files with multiple alternate data streams, some identical, with hard link"
 echo 1 > file
@@ -315,29 +276,24 @@ echo 5 > file:5
 mklink /h link file > nul
 echo aaa > file2:aaa
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "file with empty alternate data stream"
 echo 1 > file
 type nul > file:ads
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "directory with empty alternate data stream"
 md subdir
 type nul > subdir:ads
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "root directory with alternate data stream"
 echo 1 > ..\in.dir:ads
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "root directory with empty alternate data stream"
 type nul > ..\in.dir:ads
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "subdirectory with alternate data streams"
 md subdir
@@ -345,7 +301,6 @@ echo 1 > subdir:1
 echo 2 > subdir:2
 echo 2 > subdir:2again
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "subdirectories and files with alternate data streams"
 md subdir
@@ -359,7 +314,6 @@ echo 8 > helloagain:8
 echo 1 > 1
 type nul > helloagain:dummy
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "symbolic link and hard link, to file with alternate data streams"
 echo 1 > 1
@@ -367,7 +321,6 @@ echo test > .\1:test
 mklink symlink 1 > nul
 mklink /h hardlink 1 > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "compressed file with alternate data streams"
 echo 1 > 1
@@ -375,56 +328,47 @@ echo 1 > .\1:1
 echo 2 > .\1:2
 compact /C 1 > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "hidden file"
 echo 1 > hidden
 attrib +h hidden
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "hidden system file"
 echo 1 > file
 attrib +h +s file
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "hidden, readonly, system file"
 echo 1 > file
 attrib +h +r +s file
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "hidden directory"
 md subdir
 attrib +h subdir
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "hidden system directory"
 md subdir
 attrib +h +s subdir
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "hidden, readonly, system directory"
 md subdir
 attrib +h +r +s subdir
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "readonly directory with named data stream"
 md subdir
 echo foo > subdir:ads
 attrib +r subdir
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "encrypted file"
 echo "hello" > encrypted
 cipher /e encrypted > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "identical encrypted files"
 echo "hello" > encrypted1
@@ -432,13 +376,11 @@ echo "hello" > encrypted2
 cipher /e encrypted1 > nul
 cipher /e encrypted2 > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "encrypted directory"
 md subdir
 cipher /e subdir > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "encrypted directory with encrypted file in it"
 md subdir
@@ -446,7 +388,6 @@ echo 1 > subdir\1
 cipher /e subdir > nul
 cipher /e subdir\1 > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "encrypted directory with unencrypted file in it"
 md subdir
@@ -454,7 +395,6 @@ echo 1 > subdir\1
 cipher /e subdir > nul
 cipher /d subdir\1 > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "encrypted root directory"
 cd ..
@@ -462,7 +402,6 @@ cipher /e in.dir > nul
 cd in.dir
 echo "hello" > encrypted
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "unencrypted file in encrypted directory in compressed directory"
 md 1
@@ -472,7 +411,6 @@ cipher /e 1\2 > nul
 echo hello > 1\2\file
 cipher /d 1\2\file > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "encrypted directory with alternate data streams"
 md subdir
@@ -480,7 +418,6 @@ cipher /e subdir > nul
 echo ads1 > subdir:ads1
 echo ads2 > subdir:ads2
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "hardlinked, encrypted file with alternate data streams"
 echo hello > file
@@ -488,7 +425,6 @@ echo hello > file:ads
 cipher /e file > nul
 mklink /h link file > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 REM Note: since object IDs must be unique per filesystem, we can't expect them
 REM to preserved using our testing scheme.  Therefore, win32-tree-cmp doesn't
@@ -499,13 +435,11 @@ call :msg "file with object ID"
 echo hello > file
 fsutil objectid create file > nul
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 call :msg "directory with object ID"
 md subdir
 fsutil objectid set f67394c12b17608e1d050d181ba8ffd2 7df80cbdf620f4c82c79b9e6799147b6 97621aff72915ade05abb96b15dea1a3 e0bda4caa9e33cfd461c92c16be9713d subdir
 call :do_test
-if %errorlevel% neq 0 goto :fail
 
 :rpfix_tests
 
@@ -588,4 +522,4 @@ goto :eof
 echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 echo            TEST FAILED!!!!!!!
 echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-exit /b %errorlevel%
+exit %errorlevel%
-- 
2.43.0