diff options
Diffstat (limited to 'util-vserver/patches/0.30.210-r7/util-vserver-0.30.210-testsuite-fix.patch')
-rw-r--r-- | util-vserver/patches/0.30.210-r7/util-vserver-0.30.210-testsuite-fix.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/util-vserver/patches/0.30.210-r7/util-vserver-0.30.210-testsuite-fix.patch b/util-vserver/patches/0.30.210-r7/util-vserver-0.30.210-testsuite-fix.patch new file mode 100644 index 0000000..b9cfd46 --- /dev/null +++ b/util-vserver/patches/0.30.210-r7/util-vserver-0.30.210-testsuite-fix.patch @@ -0,0 +1,52 @@ +diff -NurpP util-vserver-0.30.210/lib/testsuite/personality.c util-vserver-0.30.210-testfix/lib/testsuite/personality.c +--- util-vserver-0.30.210/lib/testsuite/personality.c 2005-12-31 11:31:55.000000000 +0100 ++++ util-vserver-0.30.210-testfix/lib/testsuite/personality.c 2006-03-16 17:41:30.239559250 +0100 +@@ -73,7 +73,6 @@ int main() + TEST_T2PF("SHORT_INODE", 0, SHORT_INODE); + TEST_T2PF("WHOLE_SECONDS", 0, WHOLE_SECONDS); + TEST_T2PF("STICKY_TIMEOUTS", 0, STICKY_TIMEOUTS); +- TEST_T2PF("ADDR_LIMIT_3GB", 0, ADDR_LIMIT_3GB); + + + // the _loc* tests +@@ -82,7 +81,6 @@ int main() + TEST_PF2T("SHORT_INODE", SHORT_INODE); + TEST_PF2T("WHOLE_SECONDS", WHOLE_SECONDS); + TEST_PF2T("STICKY_TIMEOUTS", STICKY_TIMEOUTS); +- TEST_PF2T("ADDR_LIMIT_3GB", ADDR_LIMIT_3GB); + + + +@@ -123,10 +121,10 @@ int main() + TEST_LIST("mmap_page_zero,any", 0, -1, MMAP_PAGE_ZERO, 15, 3); + + TEST_LIST("mmap_page_zero,addr_limit_32bit,short_inode,whole_seconds," +- "sticky_timeouts,addr_limit_3gb", ++ "sticky_timeouts", + 0, 0, + MMAP_PAGE_ZERO|ADDR_LIMIT_32BIT|SHORT_INODE|WHOLE_SECONDS| +- STICKY_TIMEOUTS|ADDR_LIMIT_3GB, ++ STICKY_TIMEOUTS, + -1, 0); + + TEST_T2PT("linux", 0, PER_LINUX); +diff -NurpP util-vserver-0.30.210/src/testsuite/vunify-test.sh util-vserver-0.30.210-testfix/src/testsuite/vunify-test.sh +--- util-vserver-0.30.210/src/testsuite/vunify-test.sh 2005-03-21 21:03:33.000000000 +0100 ++++ util-vserver-0.30.210-testfix/src/testsuite/vunify-test.sh 2006-03-16 17:37:04.014921250 +0100 +@@ -1,6 +1,7 @@ + #! /bin/bash + +-: ${srcdir=.} ++: ${srcdir:=.} ++: ${builddir:=.} + : ${tmptopdir=/var/tmp} + + set -e +@@ -49,5 +50,5 @@ pushd $tmpdir &>/dev/null + popd &>/dev/null + + +-$D ./src/vunify -n --manually $tmpdir/a '' $tmpdir/b '' >/dev/null +-$D ./src/vunify -n --manually $tmpdir/a '' $tmpdir/c '' >/dev/null ++$builddir/src/vunify -n --manually $tmpdir/a '' $tmpdir/b '' >/dev/null ++$builddir/src/vunify -n --manually $tmpdir/a '' $tmpdir/c '' >/dev/null |