diff options
Diffstat (limited to 'test/tcl/test.tcl')
| -rw-r--r-- | test/tcl/test.tcl | 64 |
1 files changed, 49 insertions, 15 deletions
diff --git a/test/tcl/test.tcl b/test/tcl/test.tcl index 8e2579c5..a11d1c2d 100644 --- a/test/tcl/test.tcl +++ b/test/tcl/test.tcl @@ -1,8 +1,8 @@ # See the file LICENSE for redistribution information. # -# Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved. # -# $Id$ +# $Id: test.tcl,v fa50617a1e4c 2012/08/17 09:59:58 carol $ source ./include.tcl @@ -136,6 +136,7 @@ set test_recopts { "-recover" "" } # Set up any OS-specific values. global tcl_platform +set is_aix_test [string match AIX $tcl_platform(os)] set is_freebsd_test [string match FreeBSD $tcl_platform(os)] set is_hp_test [string match HP-UX $tcl_platform(os)] set is_linux_test [string match Linux $tcl_platform(os)] @@ -174,6 +175,7 @@ if { $stat != 0 } { # Make sure it's the right error for a non-crypto release. error_check_good non_crypto_release \ [expr [is_substr $result "operation not supported"] || \ + [is_substr $result "did not include support for cryptography"] || \ [is_substr $result "invalid argument"]] 1 set has_crypto 0 } else { @@ -260,6 +262,7 @@ proc run_std { { testname ALL } args } { {"locking" "lock"} {"logging" "log"} {"memory pool" "memp"} + {"multiversion" "multiversion"} {"mutex" "mutex"} {"transaction" "txn"} {"deadlock detection" "dead"} @@ -272,9 +275,10 @@ proc run_std { { testname ALL } args } { {"secondary index" "sindex"} {"partition" "partition"} {"compression" "compressed"} - {"automated repmgr tests" "auto_repmgr"} - {"other repmgr tests" "other_repmgr"} - {"repmgr multi-process" "multi_repmgr"} + {"automated repmgr tests" "repmgr_auto"} + {"repmgr multi-process" "repmgr_multiproc"} + {"other repmgr tests" "repmgr_other"} + {"expected failures" "fail"} } # If this is run_std only, run each rep test for a single @@ -489,6 +493,7 @@ proc check_output { file } { ^\t*[e|E]nv[0-9][0-9][0-9].*| ^\t*Executing\scommand$| ^\t*Executing\stxn_.*| + ^\t*[F|f]ail[0-9][0-9][0-9].*| ^\t*File\srecd005\.\d\.db\sexecuted\sand\saborted\.$| ^\t*File\srecd005\.\d\.db\sexecuted\sand\scommitted\.$| ^\t*[f|F]op[0-9][0-9][0-9].*| @@ -583,16 +588,17 @@ proc r { args } { set sub [ lindex $args 0 ] set starttest [lindex $args 1] switch $sub { - auto_repmgr - bigfile - dead - env - + fail - lock - log - memp - - multi_repmgr - mutex - - other_repmgr - + repmgr_auto - + repmgr_multiproc - + repmgr_other - rsrc - sdbtest - txn { @@ -603,13 +609,17 @@ proc r { args } { run_subsystem $sub 0 1 $starttest } } + backup { + if { $one_test == "ALL" } { + run_test backup $display $run + } + } byte { if { $one_test == "ALL" } { run_test byteorder $display $run } } archive - - backup - dbm - hsearch - ndbm - @@ -623,10 +633,10 @@ proc r { args } { } } compact - - elect - + fop - inmemdb - - init - - fop { + rep_elect - + rep_init { set tindx [lsearch $test_names($sub) $starttest] if { $tindx == -1 } { set tindx 0 @@ -642,8 +652,20 @@ proc r { args } { set tindex 0 } set clist [lrange $test_names(test) $tindex end] + set clist [concat $clist $test_names(sdb)] foreach test $clist { - eval run_compressed btree $test $display $run + # Each skipping test can be removed from + # below list if related bug is fixed. + # (sdb006 - [#22058])(sdb013 - [#22055]) + # (sdb017 - [#22056])(sdb018 - [#22062]) + if { $test == "sdb006" || + $test == "sdb013" || + $test == "sdb017" || + $test == "sdb018" } { + continue + } + eval run_compressed\ + btree $test $display $run } } join { @@ -704,6 +726,18 @@ proc r { args } { eval jointest 512 3 } } + multiversion { + if { $one_test == "ALL" } { + if { $display } { + puts "eval rep065 -btree" + puts "eval repmgr035" + } + if { $run } { + eval rep065 -btree + eval repmgr035 + } + } + } partition { foreach method { btree hash } { foreach test "$test_names(recd)\ @@ -724,8 +758,8 @@ proc r { args } { $display $run $args } repmgr { - r other_repmgr - foreach test $test_names(basic_repmgr) { + r repmgr_other + foreach test $test_names(repmgr_basic) { $test 100 1 1 1 1 1 $test 100 1 0 0 0 0 $test 100 0 1 0 0 0 |