From b90c4ffff43f4b7d62317157dbbba4fad307d66f Mon Sep 17 00:00:00 2001 From: Tim Shimmin Date: Mon, 21 Jun 2004 08:20:53 +0000 Subject: [PATCH] Some fixups when testing on IRIX. The xfs_db push command semantics seem to have changed on Linux since the port. On IRIX after a push, the state - such as the type - which is pushed on the stack, no longer seems to be kept current. --- 003 | 11 +++++++--- 010 | 5 +---- 010.out | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ 010.out.irix | 58 --------------------------------------------------- 010.out.linux | 58 --------------------------------------------------- 5 files changed, 67 insertions(+), 123 deletions(-) delete mode 100644 010.out.irix delete mode 100644 010.out.linux diff --git a/003 b/003 index 45d14f86..6e91168c 100755 --- a/003 +++ b/003 @@ -89,9 +89,14 @@ test_done echo "=== TEST 5 ===" xfs_db -r -c 'inode 128' -c 'push' -c 'type' $TEST_DEV >$tmp.out 2>&1 test_done -if ! grep -q "current type is \"inode\"" $tmp.out -then - cat $tmp.out +# On IRIX we lose state after a "push" operation and don't +# know the type is still inode +# Probably not worth changing xfs_db on IRIX for this. +if [ "$HOSTOS" != "IRIX" ]; then + if ! grep -q "current type is \"inode\"" $tmp.out + then + cat $tmp.out + fi fi echo "=== TEST 6 ===" diff --git a/010 b/010 index 8b646f98..0c6ca58a 100755 --- a/010 +++ b/010 @@ -67,9 +67,6 @@ _filter_dbtest() . ./common.rc . ./common.filter -# link correct .out file -_link_out_file $seq.out - [ -x $here/src/dbtest ] || _notrun "dbtest was not built for this platform" # real QA test starts here @@ -82,7 +79,7 @@ rm -f $seq.full cd $testdir -$here/src/dbtest -l 5 -n 3000 2>&1 | tee -a $here/$seq.full | _filter_dbtest +$here/src/dbtest -l 5 -n 1000 2>&1 | tee -a $here/$seq.full | _filter_dbtest # success, all done exit diff --git a/010.out b/010.out index e69de29b..56a3ccb9 100644 --- a/010.out +++ b/010.out @@ -0,0 +1,58 @@ +QA output created by 010 +dbtest v1.0 + +Creating database containing 1000 records... + performing lookups for 5 iterations... + using BLEEP as seed for srandom()... + + +There were BLEEP duplicate checksums generated + +Performing lookups on database... + + Sequential lookups... + + + Random lookups... + +Lookups succeeded... + +Performing lookups on database... + + Sequential lookups... + + + Random lookups... + +Lookups succeeded... + +Performing lookups on database... + + Sequential lookups... + + + Random lookups... + +Lookups succeeded... + +Performing lookups on database... + + Sequential lookups... + + + Random lookups... + +Lookups succeeded... + +Performing lookups on database... + + Sequential lookups... + + + Random lookups... + +Lookups succeeded... + +Cleaning up database... + +There were BLEEP duplicate checksums generated diff --git a/010.out.irix b/010.out.irix deleted file mode 100644 index f38fe1e6..00000000 --- a/010.out.irix +++ /dev/null @@ -1,58 +0,0 @@ -QA output created by 010 -dbtest v1.0 - -Creating database containing 500 records... - performing lookups for 5 iterations... - using BLEEP as seed for srandom()... - - -There were BLEEP duplicate checksums generated - -Performing lookups on database... - - Sequential lookups... - - - Random lookups... - -Lookups succeeded... - -Performing lookups on database... - - Sequential lookups... - - - Random lookups... - -Lookups succeeded... - -Performing lookups on database... - - Sequential lookups... - - - Random lookups... - -Lookups succeeded... - -Performing lookups on database... - - Sequential lookups... - - - Random lookups... - -Lookups succeeded... - -Performing lookups on database... - - Sequential lookups... - - - Random lookups... - -Lookups succeeded... - -Cleaning up database... - -There were BLEEP duplicate checksums generated diff --git a/010.out.linux b/010.out.linux deleted file mode 100644 index 6472a5d0..00000000 --- a/010.out.linux +++ /dev/null @@ -1,58 +0,0 @@ -QA output created by 010 -dbtest v1.0 - -Creating database containing 3000 records... - performing lookups for 5 iterations... - using BLEEP as seed for srandom()... - - -There were BLEEP duplicate checksums generated - -Performing lookups on database... - - Sequential lookups... - - - Random lookups... - -Lookups succeeded... - -Performing lookups on database... - - Sequential lookups... - - - Random lookups... - -Lookups succeeded... - -Performing lookups on database... - - Sequential lookups... - - - Random lookups... - -Lookups succeeded... - -Performing lookups on database... - - Sequential lookups... - - - Random lookups... - -Lookups succeeded... - -Performing lookups on database... - - Sequential lookups... - - - Random lookups... - -Lookups succeeded... - -Cleaning up database... - -There were BLEEP duplicate checksums generated -- 2.39.5