From 8773e743c518578584d07d35ffdafdd598af88b0 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 16 Oct 2006 13:06:41 +0000 Subject: r19339: Merge my 4.0-unittest branch. This adds an API for more fine-grained output in the testsuite rather than just True or False for a set of tests. The aim is to use this for: * known failure lists (run all tests and detect tests that started working or started failing). This would allow us to get rid of the RPC-SAMBA3-* tests * nicer torture output * simplification of the testsuite system * compatibility with other unit testing systems * easier usage of smbtorture (being able to run one test and automatically set up the environment for that) This is still a work-in-progress; expect more updates over the next couple of days. (This used to be commit 0eb6097305776325c75081356309115f445a7218) --- source4/torture/raw/raw.c | 65 ++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 29 deletions(-) (limited to 'source4/torture/raw') diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c index e2fdf67ca0..411430a565 100644 --- a/source4/torture/raw/raw.c +++ b/source4/torture/raw/raw.c @@ -25,37 +25,44 @@ NTSTATUS torture_raw_init(void) { + struct torture_suite *suite = torture_suite_create( + talloc_autofree_context(), + "RAW"); /* RAW smb tests */ + torture_suite_add_simple_test(suite, "BENCH-OPLOCK", torture_bench_oplock); + torture_suite_add_simple_test(suite, "QFSINFO", torture_raw_qfsinfo); + torture_suite_add_simple_test(suite, "QFILEINFO", torture_raw_qfileinfo); + torture_suite_add_simple_test(suite, "SFILEINFO", torture_raw_sfileinfo); + torture_suite_add_simple_test(suite, "SFILEINFO-BUG", torture_raw_sfileinfo_bug); + torture_suite_add_simple_test(suite, "SEARCH", torture_raw_search); + torture_suite_add_simple_test(suite, "CLOSE", torture_raw_close); + torture_suite_add_simple_test(suite, "OPEN", torture_raw_open); + torture_suite_add_simple_test(suite, "MKDIR", torture_raw_mkdir); + torture_suite_add_simple_test(suite, "OPLOCK", torture_raw_oplock); + torture_suite_add_simple_test(suite, "NOTIFY", torture_raw_notify); + torture_suite_add_simple_test(suite, "MUX", torture_raw_mux); + torture_suite_add_simple_test(suite, "IOCTL", torture_raw_ioctl); + torture_suite_add_simple_test(suite, "CHKPATH", torture_raw_chkpath); + torture_suite_add_simple_test(suite, "UNLINK", torture_raw_unlink); + torture_suite_add_simple_test(suite, "READ", torture_raw_read); + torture_suite_add_simple_test(suite, "WRITE", torture_raw_write); + torture_suite_add_simple_test(suite, "LOCK", torture_raw_lock); + torture_suite_add_simple_test(suite, "CONTEXT", torture_raw_context); + torture_suite_add_simple_test(suite, "RENAME", torture_raw_rename); + torture_suite_add_simple_test(suite, "SEEK", torture_raw_seek); + torture_suite_add_simple_test(suite, "EAS", torture_raw_eas); + torture_suite_add_simple_test(suite, "STREAMS", torture_raw_streams); + torture_suite_add_simple_test(suite, "ACLS", torture_raw_acls); + torture_suite_add_simple_test(suite, "COMPOSITE", torture_raw_composite); + torture_suite_add_simple_test(suite, "SAMBA3HIDE", torture_samba3_hide); + torture_suite_add_simple_test(suite, "SAMBA3CHECKFSP", torture_samba3_checkfsp); + torture_suite_add_simple_test(suite, "SAMBA3BADPATH", torture_samba3_badpath); + torture_suite_add_simple_test(suite, "SCAN-EAMAX", torture_max_eas); - register_torture_op("BENCH-OPLOCK", torture_bench_oplock); - register_torture_op("RAW-QFSINFO", torture_raw_qfsinfo); - register_torture_op("RAW-QFILEINFO", torture_raw_qfileinfo); - register_torture_op("RAW-SFILEINFO", torture_raw_sfileinfo); - register_torture_op("RAW-SFILEINFO-BUG", torture_raw_sfileinfo_bug); - register_torture_op("RAW-SEARCH", torture_raw_search); - register_torture_op("RAW-CLOSE", torture_raw_close); - register_torture_op("RAW-OPEN", torture_raw_open); - register_torture_op("RAW-MKDIR", torture_raw_mkdir); - register_torture_op("RAW-OPLOCK", torture_raw_oplock); - register_torture_op("RAW-NOTIFY", torture_raw_notify); - register_torture_op("RAW-MUX", torture_raw_mux); - register_torture_op("RAW-IOCTL", torture_raw_ioctl); - register_torture_op("RAW-CHKPATH", torture_raw_chkpath); - register_torture_op("RAW-UNLINK", torture_raw_unlink); - register_torture_op("RAW-READ", torture_raw_read); - register_torture_op("RAW-WRITE", torture_raw_write); - register_torture_op("RAW-LOCK", torture_raw_lock); - register_torture_op("RAW-CONTEXT", torture_raw_context); - register_torture_op("RAW-RENAME", torture_raw_rename); - register_torture_op("RAW-SEEK", torture_raw_seek); - register_torture_op("RAW-EAS", torture_raw_eas); - register_torture_op("RAW-STREAMS", torture_raw_streams); - register_torture_op("RAW-ACLS", torture_raw_acls); - register_torture_op("RAW-COMPOSITE", torture_raw_composite); - register_torture_op("RAW-SAMBA3HIDE", torture_samba3_hide); - register_torture_op("RAW-SAMBA3CHECKFSP", torture_samba3_checkfsp); - register_torture_op("RAW-SAMBA3BADPATH", torture_samba3_badpath); - register_torture_op("SCAN-EAMAX", torture_max_eas); + suite->description = talloc_strdup(suite, + "Tests for the raw SMB interface"); + + torture_register_suite(suite); return NT_STATUS_OK; } -- cgit