Revision: 903 http://trac.macosforge.org/projects/darwinbuild/changeset/903 Author: wsiegrist@apple.com Date: 2010-10-28 08:30:25 -0700 (Thu, 28 Oct 2010) Log Message: ----------- Test case for 8604911 which tests that we restore directory contents of dir->file forced installs upon uninstall Modified Paths: -------------- branches/PR-8604911/testing/darwinup/dest.tar.gz branches/PR-8604911/testing/darwinup/run-tests.sh Modified: branches/PR-8604911/testing/darwinup/dest.tar.gz =================================================================== (Binary files differ) Modified: branches/PR-8604911/testing/darwinup/run-tests.sh =================================================================== --- branches/PR-8604911/testing/darwinup/run-tests.sh 2010-10-28 15:13:32 UTC (rev 902) +++ branches/PR-8604911/testing/darwinup/run-tests.sh 2010-10-28 15:30:25 UTC (rev 903) @@ -353,6 +353,7 @@ is_file $DEST/rep_file $DARWINUP -f install $PREFIX/rep_file_dir is_dir $DEST/rep_file +is_file $DEST/rep_file/subfile $DARWINUP uninstall newest is_file $DEST/rep_file echo "DIFF: diffing original test files to dest (should be no diffs) ..." @@ -369,19 +370,23 @@ echo "========== TEST: Forcing object change: directory to file ==========" is_dir $DEST/rep_dir +is_file $DEST/rep_dir/subfile $DARWINUP -f install $PREFIX/rep_dir_file is_file $DEST/rep_dir $DARWINUP uninstall newest is_dir $DEST/rep_dir +is_file $DEST/rep_dir/subfile echo "DIFF: diffing original test files to dest (should be no diffs) ..." $DIFF $ORIG $DEST 2>&1 echo "========== TEST: Forcing object change: directory to symlink ==========" is_dir $DEST/rep_dir +is_file $DEST/rep_dir/subfile $DARWINUP -f install $PREFIX/rep_dir_link is_link $DEST/rep_dir $DARWINUP uninstall newest is_dir $DEST/rep_dir +is_file $DEST/rep_dir/subfile echo "DIFF: diffing original test files to dest (should be no diffs) ..." $DIFF $ORIG $DEST 2>&1 @@ -398,6 +403,7 @@ is_link $DEST/rep_link $DARWINUP -f install $PREFIX/rep_link_dir is_dir $DEST/rep_link +is_file $DEST/rep_link/subfile $DARWINUP uninstall newest is_link $DEST/rep_link echo "DIFF: diffing original test files to dest (should be no diffs) ..." @@ -416,6 +422,7 @@ is_link $DEST/rep_flink $DARWINUP -f install $PREFIX/rep_flink_dir is_dir $DEST/rep_flink +is_file $DEST/rep_flink/subfile $DARWINUP uninstall newest is_link $DEST/rep_flink echo "DIFF: diffing original test files to dest (should be no diffs) ..."