diff --git a/tests/unit/lexer.scm b/tests/unit/lexer.scm index 6306456..4040244 100644 --- a/tests/unit/lexer.scm +++ b/tests/unit/lexer.scm @@ -17,6 +17,8 @@ ;;; along with Gash. If not, see . (define-module (test-lexer) + #:use-module (gash compat) + #:use-module (gash compat textual-ports) #:use-module (gash lexer) #:use-module (ice-9 match) #:use-module (srfi srfi-64) @@ -347,7 +349,7 @@ '((WORD (0 . 6) ( ( "foo")))) (parameterize ((read-bracketed-command (lambda (port) - (string-for-each (lambda _ (read-char port)) "foo") + (string-for-each (lambda _ (get-char port)) "foo") '(( "foo"))))) (tokenize "$(foo)"))) @@ -359,7 +361,7 @@ '((WORD (0 . 5) ( ( "foo")))) (parameterize ((read-backquoted-command (lambda* (port #:key quoted?) - (string-for-each (lambda _ (read-char port)) "foo") + (string-for-each (lambda _ (get-char port)) "foo") '(( "foo"))))) (tokenize "`foo`"))) @@ -368,7 +370,7 @@ (parameterize ((read-backquoted-command (lambda* (port #:key quoted?) (set! flag quoted?) - (string-for-each (lambda _ (read-char port)) "foo") + (string-for-each (lambda _ (get-char port)) "foo") '(( "foo"))))) (tokenize "`foo`")) (not flag))) @@ -378,7 +380,7 @@ (parameterize ((read-backquoted-command (lambda* (port #:key quoted?) (set! flag quoted?) - (string-for-each (lambda _ (read-char port)) "foo") + (string-for-each (lambda _ (get-char port)) "foo") '(( "foo"))))) (tokenize "\"`foo`\"")) flag)) diff --git a/tests/unit/parser.scm b/tests/unit/parser.scm index 97c70ad..d47bffd 100644 --- a/tests/unit/parser.scm +++ b/tests/unit/parser.scm @@ -17,6 +17,7 @@ ;;; along with Gash. If not, see . (define-module (test-parser) + #:use-module (gash compat) #:use-module (gash parser) #:use-module (srfi srfi-64) #:use-module (tests unit automake)) diff --git a/tests/unit/shell.scm b/tests/unit/shell.scm index 638f85f..96d5c14 100644 --- a/tests/unit/shell.scm +++ b/tests/unit/shell.scm @@ -33,6 +33,13 @@ ;;; ;;; Code: +(cond-expand + (mes + ;; These tests are too hard to port. + (display "Shell tests are not supported on Mes\n") + (exit 0)) + (else)) + (define (make-temporary-directory) (let loop ((name (tmpnam))) (catch 'system-error diff --git a/tests/unit/word.scm b/tests/unit/word.scm index 8e6e4b4..eaf6e33 100644 --- a/tests/unit/word.scm +++ b/tests/unit/word.scm @@ -22,6 +22,7 @@ ;;; along with Gash. If not, see . (define-module (test-word) + #:use-module (gash compat) #:use-module (gash environment) #:use-module (gash word) #:use-module (ice-9 i18n) @@ -36,6 +37,14 @@ ;;; ;;; Code: +(cond-expand + (mes + (define string-locale