Sat Jan 8 05:33:34 2011 UTC ()

Fix and re-enable the delete_btree test case


(pgoyette)

diff -r1.1 -r1.2 src/tests/lib/libc/db/t_db.sh

--- src/tests/lib/libc/db/t_db.sh 2011/01/07 15:05:58	1.1
+++ src/tests/lib/libc/db/t_db.sh 2011/01/08 05:33:34	1.2

 @@ -1,14 +1,14 @@
-# $NetBSD: t_db.sh,v 1.1 2011/01/07 15:05:58 pgoyette Exp $
+# $NetBSD: t_db.sh,v 1.2 2011/01/08 05:33:34 pgoyette Exp $
+#
 # Copyright (c) 2008 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 @@ -449,71 +449,87 @@ alternate_recno_body()
+}
 h_delete()
+{
 	TMPDIR="$(pwd)/db_dir"; export TMPDIR
 	mkdir ${TMPDIR}
 	type=$1
 	echo $SEVEN_SEVEN |
 	awk '{
 		for (i = 1; i <= 120; ++i)
 			printf("%05d: input key %d: %s\n", i, i, $0);
 		printf("%05d: input key %d: %s\n", 120, 120, $0);
 		printf("seq failed, no such key\n");
 		printf("%05d: input key %d: %s\n", 1, 1, $0);
 		printf("%05d: input key %d: %s\n", 2, 2, $0);
 		exit;
 	}' >exp
 	cat exp |
 	awk '{
 		if (i == 120)
 			exit;
 		printf("p\nk%d\nd%s\n", ++i, $0);
+	}
 	END {
 		printf("fR_NEXT\n");
 		for (i = 1; i <= 120; ++i)
 			printf("s\n");
-		printf("fR_CURSOR\ns\nk120\n");
+		printf("fR_CURSOR\ns\nkXX\n");
 		printf("r\n");
 		printf("fR_NEXT\ns\n");
 		printf("fR_CURSOR\ns\nk1\n");
 		printf("r\n");
 		printf("fR_FIRST\ns\n");
 	}' >in
 	# For btree, the records are ordered by the string representation
 	# of the key value.  So sort the expected output file accordingly,
 	# and set the seek_last key to the last expected key value.
 	if [ "$type" = "btree" ] ; then
 		sed -e 's/kXX/k99/' < in > tmp
 		mv tmp in
 		sort -d -k4 < exp > tmp
 		mv tmp exp
 		echo $SEVEN_SEVEN |
 		awk '{
 			printf("%05d: input key %d: %s\n", 99, 99, $0);
 			printf("seq failed, no such key\n");
 			printf("%05d: input key %d: %s\n", 1, 1, $0);
 			printf("%05d: input key %d: %s\n", 10, 10, $0);
 			exit;
 		}' >> exp
 	else
 	# For recno, records are ordered by numerical key value.  No sort
 	# is needed, but still need to set proper seek_last key value.
 		sed -e 's/kXX/k120/' < in > tmp
 		mv tmp in
 		echo $SEVEN_SEVEN |
 		awk '{
 			printf("%05d: input key %d: %s\n", 120, 120, $0);
 			printf("seq failed, no such key\n");
 			printf("%05d: input key %d: %s\n", 1, 1, $0);
 			printf("%05d: input key %d: %s\n", 2, 2, $0);
 			exit;
 		}' >> exp
 	fi
 	atf_check "$(prog)" -o out $type in
 	atf_check -o file:exp cat out
+}
 # FIXME: should it actually work? the original test apparently
 # was supposed to run such test, but didn't
 atf_test_case delete_btree
 delete_btree_head()
+{
 	atf_set "descr" "Checks removing records in btree database"
+}
 delete_btree_body()
+{
 # The delete_btree test was skipped in the original ..../regress test
 # structure, so noone ever noticed that it didn't work!  Disable it for
 # now, until we correct the generation of in/out files to reflect the
 # actual collating sequence of key values ("19" comes before "2")
 	atf_skip "delete_btreee test case is broken"
 	h_delete btree
+}
 atf_test_case delete_recno
 delete_recno_head()
+{
 	atf_set "descr" "Checks removing records in recno database"
+}
 delete_recno_body()
+{
 	h_delete recno
+}