Index: ducttape/test_ducttape.scm ================================================================== --- ducttape/test_ducttape.scm +++ ducttape/test_ducttape.scm @@ -7,34 +7,34 @@ (set! systype (do-or-die (if (file-exists? "/bin/uname") "/bin/uname" "/usr/bin/uname"))) ;(trace skim-cmdline-opts-withargs-by-regex) ;(trace keyword-skim) ;(trace re-match?) (define (reset-ducttape) - (unsetenv "ducttape_DEBUG_LEVEL") + (unsetenv "DUCTTAPE_DEBUG_LEVEL") (ducttape-debug-level #f) - (unsetenv "ducttape_DEBUG_PATTERN") + (unsetenv "DUCTTAPE_DEBUG_PATTERN") (ducttape-debug-regex-filter ".") - (unsetenv "ducttape_LOG_FILE") + (unsetenv "DUCTTAPE_LOG_FILE") (ducttape-log-file #f) - (unsetenv "ducttape_SILENT_MODE") + (unsetenv "DUCTTAPE_SILENT_MODE") (ducttape-silent-mode #f) - (unsetenv "ducttape_QUIET_MODE") + (unsetenv "DUCTTAPE_QUIET_MODE") (ducttape-quiet-mode #f) - (unsetenv "ducttape_COLOR_MODE") + (unsetenv "DUCTTAPE_COLOR_MODE") (ducttape-color-mode #f) ) (define (reset-ducttape-with-cmdline-list cmdline-list) (reset-ducttape) (command-line-arguments cmdline-list) - (ducttape-process-command-line) + (process-command-line) ) (define (direct-iputs-test) (ducttape-color-mode #f) @@ -134,11 +134,11 @@ (let ((expected-code (if (equal? systype "Darwin") 1 2)) (expected-err (if (equal? systype "Darwin") "ls: /zzzzz: No such file or directory" - "/bin/ls: .* /zzzzz: No such file or directory")) + "/bin/ls: cannot access /zzzzz: No such file or directory")) ) (test "isys: /bin/ls /zzzzz should have exit code 2" expected-code ec) (test "isys: /bin/ls /zzzzz should have empty stdout" "" o) (test