diff options
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/dejagnu/config/ChangeLog | 10 | ||||
| -rw-r--r-- | src/tests/dejagnu/config/default.exp | 23 |
2 files changed, 24 insertions, 9 deletions
diff --git a/src/tests/dejagnu/config/ChangeLog b/src/tests/dejagnu/config/ChangeLog index 755425bc9..654529d0d 100644 --- a/src/tests/dejagnu/config/ChangeLog +++ b/src/tests/dejagnu/config/ChangeLog @@ -1,3 +1,13 @@ +2000-07-22 Tom Yu <tlyu@mit.edu> + + * default.exp: Add code to handle setting of PASS to constrain + multipass testing to particular passes. dejagnu-1.3 doesn't have + support for PASS, so we kludge it here, though some later versions + handle it by themselves. + (krb_exit): Add new proc to clean up on exit. + (kinit): Remove "expect \r" since "expect eof" will drain the pty + buffer properly anyway. + 2000-07-02 Tom Yu <tlyu@mit.edu> * default.exp: Add rudimentary support for multiple passes. For diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp index d72a70f05..49b938be9 100644 --- a/src/tests/dejagnu/config/default.exp +++ b/src/tests/dejagnu/config/default.exp @@ -19,7 +19,7 @@ set des3_krbtgt 0 set supported_enctypes "des-cbc-crc:normal" set kdc_supported_enctypes "des-cbc-crc:normal" -set MULTIPASS { +set passes { { des des3_krbtgt=0 @@ -50,6 +50,16 @@ set MULTIPASS { } } +if [info exists PASS] { + foreach pass $passes { + if { [lsearch -exact $PASS [lindex $pass 0]] >= 0 } { + lappend MULTIPASS $pass + } + } +} else { + set MULTIPASS $passes +} + set last_passname_conf "" set last_passname_db "" @@ -1276,14 +1286,7 @@ proc kinit { name pass standalone } { } } send "$pass\r" - # This last expect seems useless, but without it the test hangs on - # AIX. - expect { - "\r" { } - } - expect eof - if ![check_exit_status kinit] { return 0 } @@ -1506,4 +1509,6 @@ proc setup_wrapper { file command } { return 1 } - +proc krb_exit { } { + stop_kerberos_daemons +} |