[darwinbuild-changes] [766] branches/PR-7593824/testing/darwinup/run-tests.sh
source_changes at macosforge.org
source_changes at macosforge.org
Thu Mar 11 10:29:57 PST 2010
Revision: 766
http://trac.macosforge.org/projects/darwinbuild/changeset/766
Author: wsiegrist at apple.com
Date: 2010-03-11 10:29:57 -0800 (Thu, 11 Mar 2010)
Log Message:
-----------
add -d option to test suite
Modified Paths:
--------------
branches/PR-7593824/testing/darwinup/run-tests.sh
Modified: branches/PR-7593824/testing/darwinup/run-tests.sh
===================================================================
--- branches/PR-7593824/testing/darwinup/run-tests.sh 2010-03-11 18:29:26 UTC (rev 765)
+++ branches/PR-7593824/testing/darwinup/run-tests.sh 2010-03-11 18:29:57 UTC (rev 766)
@@ -11,6 +11,7 @@
DEST=$PREFIX/dest
DESTTAR=dest.tar.gz
+DARWINUP="darwinup -dvvv -p $DEST "
DIFF="diff -x .DarwinDepot -x broken -qru"
ROOTS="root root2 root3"
@@ -44,22 +45,22 @@
for R in $ROOTS;
do
echo "INFO: Installing $R ...";
- darwinup -vvv -p $DEST install $PREFIX/$R
- UUID=$(darwinup -vvv -p $DEST list | head -3 | tail -1 | awk '{print $1}')
+ $DARWINUP install $PREFIX/$R
+ UUID=$($DARWINUP list | head -3 | tail -1 | awk '{print $1}')
echo "INFO: Uninstalling $R ...";
- darwinup -vvv -p $DEST uninstall $UUID
+ $DARWINUP uninstall $UUID
echo "DIFF: diffing original test files to dest (should be no diffs) ..."
$DIFF $ORIG $DEST 2>&1
done
echo "========== TEST: Multiple argument test ==========";
-darwinup -vvv -p $DEST install $PREFIX/root{,2,3}
-LINES=$(darwinup -vvv -p $DEST list | wc -l)
+$DARWINUP install $PREFIX/root{,2,3}
+LINES=$($DARWINUP list | wc -l)
if [ $LINES -lt 5 ]; then
echo "Failed multiple argument test."
exit 1;
fi
-darwinup -vvv -p $DEST uninstall all
+$DARWINUP uninstall all
echo "DIFF: diffing original test files to dest (should be no diffs) ..."
$DIFF $ORIG $DEST 2>&1
@@ -68,13 +69,13 @@
for R in $ROOTS;
do
echo "INFO: Installing $R ...";
- darwinup -vvv -p $DEST install $PREFIX/$R
+ $DARWINUP install $PREFIX/$R
done
for R in $ROOTS;
do
- UUID=$(darwinup -vvv -p $DEST list | head -3 | tail -1 | awk '{print $1}')
+ UUID=$($DARWINUP list | head -3 | tail -1 | awk '{print $1}')
echo "INFO: Uninstalling $UUID ...";
- darwinup -vvv -p $DEST uninstall $UUID
+ $DARWINUP uninstall $UUID
done
echo "DIFF: diffing original test files to dest (should be no diffs) ..."
$DIFF $ORIG $DEST 2>&1
@@ -83,13 +84,13 @@
for R in $ROOTS;
do
echo "INFO: Installing $R ...";
- darwinup -vvv -p $DEST install $PREFIX/$R
+ $DARWINUP install $PREFIX/$R
done
for R in $ROOTS;
do
- UUID=$(darwinup -vvv -p $DEST list | grep $R$ | awk '{print $1}')
+ UUID=$($DARWINUP list | grep $R$ | awk '{print $1}')
echo "INFO: Uninstalling $UUID ...";
- darwinup -vvv -p $DEST uninstall $UUID
+ $DARWINUP uninstall $UUID
done
echo "DIFF: diffing original test files to dest (should be no diffs) ..."
$DIFF $ORIG $DEST 2>&1
@@ -98,13 +99,13 @@
for R in $ROOTS;
do
echo "INFO: Installing $R ...";
- darwinup -vvv -p $DEST install $PREFIX/$R
+ $DARWINUP install $PREFIX/$R
done
for R in root2 root3 root;
do
- UUID=$(darwinup -vvv -p $DEST list | grep $R$ | awk '{print $1}')
+ UUID=$($DARWINUP list | grep $R$ | awk '{print $1}')
echo "INFO: Uninstalling $UUID ...";
- darwinup -vvv -p $DEST uninstall $UUID
+ $DARWINUP uninstall $UUID
done
echo "DIFF: diffing original test files to dest (should be no diffs) ..."
$DIFF $ORIG $DEST 2>&1
@@ -113,45 +114,45 @@
for R in root3 root2 root;
do
echo "INFO: Installing $R ...";
- darwinup -vvv -p $DEST install $PREFIX/$R
+ $DARWINUP install $PREFIX/$R
done
for R in root3 root2 root;
do
- UUID=$(darwinup -vvv -p $DEST list | grep $R$ | awk '{print $1}')
+ UUID=$($DARWINUP list | grep $R$ | awk '{print $1}')
echo "INFO: Uninstalling $UUID ...";
- darwinup -vvv -p $DEST uninstall $UUID
+ $DARWINUP uninstall $UUID
done
echo "DIFF: diffing original test files to dest (should be no diffs) ..."
$DIFF $ORIG $DEST 2>&1
echo "========== TEST: trying large roots ==========";
echo "INFO: installing 300files";
-darwinup -vvv -p $DEST install $PREFIX/300files.tbz2
-darwinup -vvv -p $DEST uninstall 300files.tbz2
+$DARWINUP install $PREFIX/300files.tbz2
+$DARWINUP uninstall 300files.tbz2
echo "DIFF: diffing original test files to dest (should be no diffs) ..."
$DIFF $ORIG $DEST 2>&1
echo "INFO: installing 300dir";
-darwinup -vvv -p $DEST install $PREFIX/300dirs.tbz2
-darwinup -vvv -p $DEST uninstall 300dirs.tbz2
+$DARWINUP install $PREFIX/300dirs.tbz2
+$DARWINUP uninstall 300dirs.tbz2
echo "DIFF: diffing original test files to dest (should be no diffs) ..."
$DIFF $ORIG $DEST 2>&1
echo "INFO: installing both 300files and 300dirs";
-darwinup -vvv -p $DEST install $PREFIX/300dirs.tbz2
-darwinup -vvv -p $DEST install $PREFIX/300files.tbz2
-darwinup -vvv -p $DEST uninstall 300dirs.tbz2
-darwinup -vvv -p $DEST uninstall 300files.tbz2
+$DARWINUP install $PREFIX/300dirs.tbz2
+$DARWINUP install $PREFIX/300files.tbz2
+$DARWINUP uninstall 300dirs.tbz2
+$DARWINUP uninstall 300files.tbz2
echo "DIFF: diffing original test files to dest (should be no diffs) ..."
$DIFF $ORIG $DEST 2>&1
echo "========== TEST: Try uninstalling with user data in rollback =========="
echo "INFO: Installing root5 ...";
-darwinup -vvv -p $DEST install $PREFIX/root5
-darwinup -vvv -p $DEST install $PREFIX/root6
+$DARWINUP install $PREFIX/root5
+$DARWINUP install $PREFIX/root6
echo "modification" >> $DEST/d/file
-darwinup -vvv -p $DEST install $PREFIX/root7
-darwinup -vvv -p $DEST uninstall root6
-darwinup -vvv -p $DEST uninstall root5
-darwinup -vvv -p $DEST uninstall root7
+$DARWINUP install $PREFIX/root7
+$DARWINUP uninstall root6
+$DARWINUP uninstall root5
+$DARWINUP uninstall root7
stat $DEST/d/file
rm $DEST/d/file
rmdir $DEST/d
@@ -159,32 +160,32 @@
$DIFF $ORIG $DEST 2>&1
echo "========== TEST: Deep rollback while saving user data =========="
-darwinup -vvv -p $DEST install $PREFIX/deep-rollback.cpgz
+$DARWINUP install $PREFIX/deep-rollback.cpgz
echo "modified" >> $DEST/d1/d2/d3/d4/d5/d6/file
-darwinup -vvv -p $DEST install $PREFIX/deep-rollback.cpgz
-darwinup -vvv -p $DEST uninstall newest
-darwinup -vvv -p $DEST uninstall newest
+$DARWINUP install $PREFIX/deep-rollback.cpgz
+$DARWINUP uninstall newest
+$DARWINUP uninstall newest
stat $DEST/d1/d2/d3/d4/d5/d6/file
rm $DEST/d1/d2/d3/d4/d5/d6/file
rm -rf $DEST/d1
echo "DIFF: diffing original test files to dest (should be no diffs) ..."
$DIFF $ORIG $DEST 2>&1
-darwinup -vvv -p $DEST install $PREFIX/deep-rollback.cpgz
-darwinup -vvv -p $DEST install $PREFIX/deep-rollback-2.xar
-darwinup -vvv -p $DEST uninstall all
+$DARWINUP install $PREFIX/deep-rollback.cpgz
+$DARWINUP install $PREFIX/deep-rollback-2.xar
+$DARWINUP uninstall all
echo "DIFF: diffing original test files to dest (should be no diffs) ..."
$DIFF $ORIG $DEST 2>&1
echo "========== TEST: Testing broken symlink handling =========="
-darwinup -vvv -p $DEST install $PREFIX/symlinks
-darwinup -vvv -p $DEST uninstall symlinks
+$DARWINUP install $PREFIX/symlinks
+$DARWINUP uninstall symlinks
echo "DIFF: diffing original test files to dest (should be no diffs) ..."
$DIFF $ORIG $DEST 2>&1
-darwinup -vvv -p $DEST install $PREFIX/symlink_update
+$DARWINUP install $PREFIX/symlink_update
stat -L $DEST/broken
-darwinup -vvv -p $DEST uninstall newest
+$DARWINUP uninstall newest
echo "DIFF: diffing original test files to dest (should be no diffs) ..."
$DIFF $ORIG $DEST 2>&1
@@ -194,7 +195,7 @@
#
set +e
echo "========== TEST: Trying a root that will fail due to object change =========="
-darwinup -vvv -p $DEST install $PREFIX/root4
+$DARWINUP install $PREFIX/root4
if [ $? -ne 1 ]; then exit 1; fi
echo "DIFF: diffing original test files to dest (should be no diffs) ..."
$DIFF $ORIG $DEST 2>&1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20100311/52403c84/attachment.html>
More information about the darwinbuild-changes
mailing list