X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=tests%2Fwin32-test-imagex-capture_and_apply.bat;h=8f573eceb62bd5ea4c7f8f7ca4b0692fa1ef816f;hp=f18939de7c4cc1d66030dc2d54272699f95bb6c0;hb=d85424218ef1148204aac3289bbf4ba2c0da9255;hpb=3bbe0bf2d7235584e1df11f21043338b18a5753e

diff --git a/tests/win32-test-imagex-capture_and_apply.bat b/tests/win32-test-imagex-capture_and_apply.bat
index f18939de..8f573ece 100644
--- a/tests/win32-test-imagex-capture_and_apply.bat
+++ b/tests/win32-test-imagex-capture_and_apply.bat
@@ -10,8 +10,9 @@ REM Administrator privileges.  wimlib-imagex and win32-tree-cmp must be
 REM executable using the paths set below.
 
 setlocal EnableDelayedExpansion
-set WIN32_TREE_CMP=win32-tree-cmp
 set WIMLIB_IMAGEX=wimlib-imagex
+set WIN32_TREE_CMP=win32-tree-cmp
+set SET_REPARSE_POINT=set_reparse_point
 
 if exist in.dir rd /S /Q in.dir
 if exist out.dir rd /S /Q out.dir
@@ -24,42 +25,48 @@ REM
 
 call :msg "empty directory"
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "single file"
 echo 1 > file
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "different files"
 echo 1 > file
 echo 2 > anotherfile
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "identical files"
 echo 1 > file
 echo 1 > identicalfile
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+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 exit /b %errorlevel%
+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 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "empty file"
 type nul > emptyfile
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+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
@@ -73,7 +80,7 @@ echo 5 > identicalfile
 echo 1 > 1file
 mklink /h 1filelink 1file > nul
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "multiple subdirectories, some empty, some not"
 md subdir1
@@ -85,25 +92,25 @@ mklink /h link subdir1\1 > nul
 md subdir2\subdir2subdir
 type nul > subdir2\emptyfile
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+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 exit /b %errorlevel%
+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 exit /b %errorlevel%
+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 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 REM            win32-tree-cmp can't handle this case.
 REM
@@ -111,46 +118,46 @@ 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 exit /b %errorlevel%
+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 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "relative symlink"
 mklink relink dest > nul
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+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 exit /b %errorlevel%
+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 exit /b %errorlevel%
+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 exit /b %errorlevel%
+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 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "junction"
 md subdir
 mklink /j junction subdir > nul
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "symlinks, junctions, files, subdirectories, etc."
 echo 1 > 1
@@ -170,19 +177,87 @@ md subdir2\s\s
 md subdir2\s\s\s
 echo "hello world!!!!" > subdir2\otherfile
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+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
+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
+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
+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
+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 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "compressed directory"
 md subdir
 compact /C subdir > nul
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "compressed directory with files in it"
 md subdir
@@ -194,7 +269,7 @@ md subdir\subsubdir
 mklink /h subdir\hardlink subdir\file1 > nul
 mklink /j subdir\j subdir\subsubdir > nul
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "compressed directory with some uncompressed files in it"
 md subdir
@@ -203,13 +278,13 @@ echo 1 > subdir\1
 echo 5 > subdir\5
 compact /U subdir\1 > nul
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+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 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "file with multiple alternate data streams"
 echo 1 > file
@@ -218,7 +293,7 @@ echo aa > file:aa
 echo aaa > file:aaa
 echo aaaa > file:aaaa
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "file with multiple alternate data streams, with hard link"
 echo 1 > file
@@ -228,7 +303,7 @@ echo aaa > file:aaa
 echo aaaa > file:aaaa
 mklink /h link file > nul
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "files with multiple alternate data streams, some identical, with hard link"
 echo 1 > file
@@ -240,24 +315,29 @@ echo 5 > file:5
 mklink /h link file > nul
 echo aaa > file2:aaa
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+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 exit /b %errorlevel%
+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 exit /b %errorlevel%
+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 exit /b %errorlevel%
+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
@@ -265,7 +345,7 @@ echo 1 > subdir:1
 echo 2 > subdir:2
 echo 2 > subdir:2again
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "subdirectories and files with alternate data streams"
 md subdir
@@ -279,7 +359,7 @@ echo 8 > helloagain:8
 echo 1 > 1
 type nul > helloagain:dummy
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "symbolic link and hard link, to file with alternate data streams"
 echo 1 > 1
@@ -287,7 +367,7 @@ echo test > .\1:test
 mklink symlink 1 > nul
 mklink /h hardlink 1 > nul
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "compressed file with alternate data streams"
 echo 1 > 1
@@ -295,49 +375,56 @@ echo 1 > .\1:1
 echo 2 > .\1:2
 compact /C 1 > nul
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "hidden file"
 echo 1 > hidden
 attrib +h hidden
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+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 exit /b %errorlevel%
+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 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "hidden directory"
 md subdir
 attrib +h subdir
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "hidden system directory"
-echo 1 > subdir
+md subdir
 attrib +h +s subdir
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "hidden, readonly, system directory"
-echo 1 > subdir
+md subdir
 attrib +h +r +s subdir
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+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 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "identical encrypted files"
 echo "hello" > encrypted1
@@ -345,13 +432,13 @@ echo "hello" > encrypted2
 cipher /e encrypted1 > nul
 cipher /e encrypted2 > nul
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "encrypted directory"
 md subdir
 cipher /e subdir > nul
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "encrypted directory with encrypted file in it"
 md subdir
@@ -359,7 +446,7 @@ echo 1 > subdir\1
 cipher /e subdir > nul
 cipher /e subdir\1 > nul
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "encrypted directory with unencrypted file in it"
 md subdir
@@ -367,7 +454,7 @@ echo 1 > subdir\1
 cipher /e subdir > nul
 cipher /d subdir\1 > nul
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "encrypted root directory"
 cd ..
@@ -375,17 +462,25 @@ cipher /e in.dir > nul
 cd in.dir
 echo "hello" > encrypted
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "unencrypted file in encrypted directory in compressed directory"
 md 1
 md 1\2
-compact /c 1 > /nul
-cipher /e 1\2 > /nul
+compact /c 1 > nul
+cipher /e 1\2 > nul
 echo hello > 1\2\file
-cipher /d 1\2\file > /nul
+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
+cipher /e subdir > nul
+echo ads1 > subdir:ads1
+echo ads2 > subdir:ads2
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 call :msg "hardlinked, encrypted file with alternate data streams"
 echo hello > file
@@ -393,7 +488,7 @@ echo hello > file:ads
 cipher /e file > nul
 mklink /h link file > nul
 call :do_test
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 
 :rpfix_tests
 
@@ -408,7 +503,7 @@ rd /s /q in.dir
 echo 1 > tmp1
 type out.dir\junction\file > tmp2
 fc tmp1 tmp2 > nul
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 rd /s /q out.dir
 del tmp1 tmp2
 md in.dir
@@ -420,8 +515,10 @@ mklink relink file > nul
 cd ..
 %WIMLIB_IMAGEX% capture in.dir test.wim > nul
 %WIMLIB_IMAGEX% apply test.wim out.dir > nul
-fc in.dir\file out.dir\relink > nul
-if %errorlevel% neq 0 exit /b %errorlevel%
+type out.dir\relink > out.dir\tmp
+if %errorlevel% neq 0 goto :fail
+fc in.dir\file out.dir\tmp > nul
+if %errorlevel% neq 0 goto :fail
 rd /s /q in.dir out.dir
 md in.dir
 cd in.dir
@@ -438,33 +535,28 @@ exit /b 0
 :do_test
 cd ..
 %WIMLIB_IMAGEX% capture in.dir test.wim --norpfix > NUL
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
 %WIMLIB_IMAGEX% apply test.wim out.dir > NUL
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %errorlevel% neq 0 goto :fail
+%WIN32_TREE_CMP% in.dir out.dir
+if %errorlevel% neq 0 goto :fail
+
+REM  apply a second time so we test the case where the files already exist
+%WIMLIB_IMAGEX% apply test.wim out.dir > NUL
+if %errorlevel% neq 0 goto :fail
+%WIN32_TREE_CMP% in.dir out.dir
+if %errorlevel% neq 0 goto :fail
+
+REM Fun fact: Microsoft's WIMGAPI has bugs that make it fail some of our tests.
+REM Even the Windows 8.1 version has incorrect behavior with empty files with
+REM multiple links, or files with named data streams and multiple links.
+rd /S /Q out.dir
+md out.dir
+REM dism /capture-image /capturedir:in.dir /imagefile:test.wim /name:"test" /norpfix > nul
+REM if %errorlevel% neq 0 goto :fail
+dism /apply-image /imagefile:test.wim /index:1 /applydir:out.dir > nul
+if %errorlevel% neq 0 goto :fail
 %WIN32_TREE_CMP% in.dir out.dir
-if %errorlevel% neq 0 (
-	echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-	echo            TEST FAILED!!!!!!!
-	echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-	exit /b %errorlevel%
-)
-
-REM Fun fact:  There are bugs in Microsoft's imagex.exe that make it fail some
-REM of our tests.
-REM
-REM rd /S /Q out.dir
-REM md out.dir
-REM imagex /capture in.dir test.wim "test" /norpfix > nul
-REM if %errorlevel% neq 0 exit /b %errorlevel%
-REM imagex /apply test.wim 1 out.dir > nul
-REM if %errorlevel% neq 0 exit /b %errorlevel%
-REM %WIN32_TREE_CMP% in.dir out.dir
-REM if %errorlevel% neq 0 (
-	REM echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-	REM echo            TEST FAILED!!!!!!! ^(imagex^)
-	REM echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-	REM exit /b %errorlevel%
-REM )
 
 rd /S /Q in.dir out.dir
 md in.dir
@@ -474,3 +566,9 @@ goto :eof
 :msg
 echo Testing capture and apply of %~1
 goto :eof
+
+:fail
+echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+echo            TEST FAILED!!!!!!!
+echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+exit /b %errorlevel%