From dd5dc2289ef7b20b6c16a9ed7b62d73251350bf2 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 27 Oct 2010 12:59:46 -0400 Subject: [PATCH] cthon: added missing patches --- ...pmapbrb-pmaptst-tests-from-tools-dir.patch | 26 ++++++++++ tests/0013-nroff-patch.patch | 26 ++++++++++ ...ng-out-symlink-test-in-special-tests.patch | 35 +++++++++++++ ...on-enabled-basic-test4a-5a-5b-and-7a.patch | 51 +++++++++++++++++++ 4 files changed, 138 insertions(+) create mode 100644 tests/0012-removing-pmapbrb-pmaptst-tests-from-tools-dir.patch create mode 100644 tests/0013-nroff-patch.patch create mode 100644 tests/0014-commenting-out-symlink-test-in-special-tests.patch create mode 100644 tests/0015-cthon-enabled-basic-test4a-5a-5b-and-7a.patch diff --git a/tests/0012-removing-pmapbrb-pmaptst-tests-from-tools-dir.patch b/tests/0012-removing-pmapbrb-pmaptst-tests-from-tools-dir.patch new file mode 100644 index 0000000..c602033 --- /dev/null +++ b/tests/0012-removing-pmapbrb-pmaptst-tests-from-tools-dir.patch @@ -0,0 +1,26 @@ +From 0e4268b2b76b5c89f9e661f7ffbb9c2a7234511c Mon Sep 17 00:00:00 2001 +From: Olga Kornievskaia +Date: Thu, 14 Oct 2010 12:26:50 -0400 +Subject: [PATCH 1/3] removing pmapbrb pmaptst tests from tools dir + +--- + tools/Makefile | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/tools/Makefile b/tools/Makefile +index ce6019f..d3fde4e 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -8,7 +8,8 @@ + # 'make copy DESTDIR=path' copies test programs to path + # 'make dist DESTDIR=path' copies sources to path + +-TESTS = tcp tcpd udp udpd dirdmp dirprt pmaptst pmapbrd ++#TESTS = tcp tcpd udp udpd dirdmp dirprt pmaptst pmapbrd ++TESTS = tcp tcpd udp udpd dirdmp dirprt + + # dirdmp apparently doesn't work with Linux 2.2. So for Linux systems, + # comment out the above definition and use this one. +-- +1.6.4.msysgit.0 + diff --git a/tests/0013-nroff-patch.patch b/tests/0013-nroff-patch.patch new file mode 100644 index 0000000..b588c21 --- /dev/null +++ b/tests/0013-nroff-patch.patch @@ -0,0 +1,26 @@ +From 343a7ad0eae100b833f2aeed5ca2406427304254 Mon Sep 17 00:00:00 2001 +From: Olga Kornievskaia +Date: Wed, 13 Oct 2010 19:45:31 -0400 +Subject: [PATCH 2/3] nroff patch + +--- + general/runtests.wrk | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/general/runtests.wrk b/general/runtests.wrk +index 83f3124..9dda456 100644 +--- a/general/runtests.wrk ++++ b/general/runtests.wrk +@@ -89,6 +89,9 @@ $TIME nroff < nroff.tbl > nroff.out 2>> nroff.time || cat nroff.time + $TIME nroff < nroff.tbl > nroff.out 2>> nroff.time || cat nroff.time + rm nroff.out nroff.tbl + set -e ++#remove nroff warnings from nroff.time ++egrep -v '^warning:.*$' nroff.new ++mv -f nroff.new nroff.time + ./stat.exe nroff.time + set +e + +-- +1.6.4.msysgit.0 + diff --git a/tests/0014-commenting-out-symlink-test-in-special-tests.patch b/tests/0014-commenting-out-symlink-test-in-special-tests.patch new file mode 100644 index 0000000..92ba745 --- /dev/null +++ b/tests/0014-commenting-out-symlink-test-in-special-tests.patch @@ -0,0 +1,35 @@ +From cf3f18a335525c4da01c85d58b46653e9c7605ec Mon Sep 17 00:00:00 2001 +From: Olga Kornievskaia +Date: Thu, 14 Oct 2010 11:29:28 -0400 +Subject: [PATCH 3/3] commenting out symlink test in special tests + +--- + special/runtests.wrk | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/special/runtests.wrk b/special/runtests.wrk +index 9543761..bd528c2 100644 +--- a/special/runtests.wrk ++++ b/special/runtests.wrk +@@ -64,12 +64,12 @@ echo "" + echo "test holey file support" + ./holey + +-if [ "$HARDLINKS"o != no ] +-then +- echo "" +- echo "second check for lost reply on non-idempotent requests" +- ./nfsidem 50 testdir +-fi ++#if [ "$HARDLINKS"o != no ] ++#then ++# echo "" ++# echo "second check for lost reply on non-idempotent requests" ++# ./nfsidem 50 testdir ++#fi + + echo "" + echo "test rewind support" +-- +1.6.4.msysgit.0 + diff --git a/tests/0015-cthon-enabled-basic-test4a-5a-5b-and-7a.patch b/tests/0015-cthon-enabled-basic-test4a-5a-5b-and-7a.patch new file mode 100644 index 0000000..db75ad0 --- /dev/null +++ b/tests/0015-cthon-enabled-basic-test4a-5a-5b-and-7a.patch @@ -0,0 +1,51 @@ +From 5d35b0e608f386be69b9c7a2f4e136a892d9f0bb Mon Sep 17 00:00:00 2001 +From: Casey Bodley +Date: Wed, 27 Oct 2010 12:57:37 -0400 +Subject: [PATCH] cthon: enabled basic test4a, 5a, 5b, and 7a + +--- + basic/runtests | 16 ++++++++-------- + 1 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/basic/runtests b/basic/runtests +index 0b2f205..9567e1a 100644 +--- a/basic/runtests ++++ b/basic/runtests +@@ -39,17 +39,17 @@ echo "" + echo "" + ./test4 $TESTARG + # Getattr and lookup tests +-# echo "" +-# ./test4a $TESTARG ++echo "" ++./test4a $TESTARG + + # Write and read tests + echo "" + ./test5 $TESTARG + # Test 5a and 5b separate out the read and write tests into simpler components. +-# echo "" +-# ./test5a $TESTARG +-# echo "" +-# ./test5b $TESTARG ++echo "" ++./test5a $TESTARG ++echo "" ++./test5b $TESTARG + + # Read Directory test + echo "" +@@ -64,8 +64,8 @@ else + ./test7a $TESTARG + fi + # Link Test +-# echo "" +-# ./test7b $TESTARG ++echo "" ++./test7b $TESTARG + + # Symlink and readlink test + echo "" +-- +1.6.4.msysgit.0 +