From 0801478e75e8545dea0b5b803af5321ab5d03af9 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Wed, 17 Jul 2019 08:38:15 -0600 Subject: [PATCH] tests/file: fix a `tar-gzip` test and incorrect `raco test` setup Related to #2744 --- pkgs/racket-test/tests/file/gzip.rkt | 6 ++++-- pkgs/racket-test/tests/file/main.rkt | 9 +++++---- pkgs/racket-test/tests/file/md5.rkt | 2 ++ pkgs/racket-test/tests/file/unpackers.rkt | 2 ++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/racket-test/tests/file/gzip.rkt b/pkgs/racket-test/tests/file/gzip.rkt index 9af83eff3c..1ecb8d73aa 100644 --- a/pkgs/racket-test/tests/file/gzip.rkt +++ b/pkgs/racket-test/tests/file/gzip.rkt @@ -93,7 +93,7 @@ (define ch (make-channel)) (thread (lambda () (with-handlers [(exn:fail? (lambda (_exn) (channel-put ch 'success)))] - (tar-gzip tgz-file long-path) + (tar-gzip tgz-file long-path #:format 'ustar) (channel-put ch 'didnt-fail-in-tar-gzip)))) (test (sync/timeout 10 ch) => 'success)) @@ -115,9 +115,11 @@ (gzip-through-ports in (open-output-bytes) "defalte-me.dat" (current-seconds))))) (provide tests) -(module+ main (tests)) (define (tests) (test do (run-tests))) +(module+ main (tests)) +;; Use "main.rkt" with `raco test`, instead of this file + #| diff --git a/pkgs/racket-test/tests/file/main.rkt b/pkgs/racket-test/tests/file/main.rkt index df4174f16e..e0b35be95a 100644 --- a/pkgs/racket-test/tests/file/main.rkt +++ b/pkgs/racket-test/tests/file/main.rkt @@ -1,8 +1,5 @@ #lang racket/base -(module test racket/base - (displayln "run as program for tests")) - (require tests/eli-tester (prefix-in gzip: "gzip.rkt") (prefix-in md5: "md5.rkt") @@ -13,4 +10,8 @@ do (md5:tests) do (unpackers:tests))) -(tests) +(module+ main + (tests)) + +(module+ test + (tests)) diff --git a/pkgs/racket-test/tests/file/md5.rkt b/pkgs/racket-test/tests/file/md5.rkt index fd3cf541dc..cb6c9a0665 100644 --- a/pkgs/racket-test/tests/file/md5.rkt +++ b/pkgs/racket-test/tests/file/md5.rkt @@ -4,6 +4,8 @@ (provide tests) (module+ main (tests)) +;; Use "main.rkt" with `raco test`, instead of this file + (define (tests) (test (md5 #"") diff --git a/pkgs/racket-test/tests/file/unpackers.rkt b/pkgs/racket-test/tests/file/unpackers.rkt index e30c852c09..3f9c54d209 100644 --- a/pkgs/racket-test/tests/file/unpackers.rkt +++ b/pkgs/racket-test/tests/file/unpackers.rkt @@ -208,6 +208,8 @@ (untgz (open-input-bytes bad-tar.gz) #:filter (lambda args #f)))))) (module+ main (tests)) +;; Use "main.rkt" with `raco test`, instead of this file + (define (tests) (test do (untar-tests) do (unzip-tests)