[functional-tests] use ../bin in the path for tools, even if they're

failing.

functional-tests/cache-functional-tests.scm

@@ -27,7 +27,7 @@
       ((_ (md) b1 b2 ...)
        (with-temp-file-sized ((md "cache.bin" (meg 4)))
          (with-cache-xml (xml)
-           (cache-restore "-i" xml "-o" md)
+           (run-ok (cache-restore "-i" xml "-o" md))
            b1 b2 ...)))))
 
   ;;; It would be nice if the metadata was at least similar to valid data.
@@ -53,27 +53,27 @@
 
   (define-scenario (cache-check v)
     "cache_check -V"
-    (receive (stdout _) (cache-check "-V")
+    (run-ok-rcv (stdout _) (cache-check "-V")
       (assert-equal tools-version stdout)))
 
   (define-scenario (cache-check version)
     "cache_check --version"
-    (receive (stdout _) (cache-check "--version")
+    (run-ok-rcv (stdout _) (cache-check "--version")
       (assert-equal tools-version stdout)))
 
   (define-scenario (cache-check h)
     "cache_check -h"
-    (receive (stdout _) (cache-check "-h")
+    (run-ok-rcv (stdout _) (cache-check "-h")
       (assert-equal cache-check-help stdout)))
 
   (define-scenario (cache-check help)
     "cache_check --help"
-    (receive (stdout _) (cache-check "--help")
+    (run-ok-rcv (stdout _) (cache-check "--help")
       (assert-equal cache-check-help stdout)))
 
   (define-scenario (cache-check must-specify-metadata)
     "Metadata file must be specified"
-    (receive (_ stderr) (run-fail "cache_check")
+    (run-fail-rcv (_ stderr) (cache-check)
       (assert-equal
         (string-append "No input file provided.\n"
                        cache-check-help)
@@ -82,7 +82,7 @@
   (define-scenario (cache-check no-such-metadata)
     "Metadata file doesn't exist."
     (let ((bad-path "/arbitrary/filename"))
-     (receive (_ stderr) (run-fail "cache_check" bad-path)
+     (run-fail-rcv (_ stderr) (cache-check bad-path)
        (assert-starts-with
          (string-append bad-path ": No such file or directory")
          stderr))))
@@ -90,7 +90,7 @@
   (define-scenario (cache-check metadata-file-cannot-be-a-directory)
     "Metadata file must not be a directory"
     (let ((bad-path "/tmp"))
-     (receive (_ stderr) (run-fail "cache_check" bad-path)
+     (run-fail-rcv (_ stderr) (cache-check bad-path)
        (assert-starts-with
          (string-append bad-path ": Not a block device or regular file")
          stderr))))
@@ -99,51 +99,51 @@
     "Metadata file exists, but is unreadable."
     (with-valid-metadata (md)
       (run-ok "chmod" "-r" md)
-      (receive (_ stderr) (run-fail "cache_check" md)
+      (run-fail-rcv (_ stderr) (cache-check md)
         (assert-starts-with "syscall 'open' failed: Permission denied" stderr))))
 
   (define-scenario (cache-check fails-with-corrupt-metadata)
     "Fail with corrupt superblock"
     (with-corrupt-metadata (md)
-      (run-fail "cache_check" md)))
+      (run-fail (cache-check md))))
 
   (define-scenario (cache-check failing-q)
     "Fail quietly with -q"
     (with-corrupt-metadata (md)
-      (receive (stdout stderr) (run-fail "cache_check" "-q" md)
+      (run-fail-rcv (stdout stderr) (cache-check "-q" md)
         (assert-eof stdout)
         (assert-eof stderr))))
 
   (define-scenario (cache-check failing-quiet)
     "Fail quietly with --quiet"
     (with-corrupt-metadata (md)
-      (receive (stdout stderr) (run-fail "cache_check" "--quiet" md)
+      (run-fail-rcv (stdout stderr) (cache-check "--quiet" md)
         (assert-eof stdout)
         (assert-eof stderr))))
 
   (define-scenario (cache-check valid-metadata-passes)
     "A valid metadata area passes"
     (with-valid-metadata (md)
-      (cache-check md)))
+      (run-ok (cache-check md))))
 
   (define-scenario (cache-check bad-metadata-version)
     "Invalid metadata version fails"
     (with-cache-xml (xml)
       (with-empty-metadata (md)
         (cache-restore "-i" xml "-o" md "--debug-override-metadata-version" "12345")
-        (run-fail "cache_check" md))))
+        (run-fail (cache-check md)))))
 
   (define-scenario (cache-check tiny-metadata)
     "Prints helpful message in case tiny metadata given"
     (with-temp-file-sized ((md "cache.bin" 1024))
-      (receive (_ stderr) (run-fail "cache_check" md)
+      (run-fail-rcv (_ stderr) (cache-check md)
         (assert-starts-with "Metadata device/file too small.  Is this binary metadata?" stderr))))
 
   (define-scenario (cache-check spot-accidental-xml-data)
     "Prints helpful message if XML metadata given"
     (with-cache-xml (xml)
       (system (fmt #f "man bash >> " xml))
-      (receive (_ stderr) (run-fail "cache_check" xml)
+      (run-fail-rcv (_ stderr) (cache-check xml)
         (assert-matches ".*This looks like XML.  cache_check only checks the binary metadata format." stderr))))
 
   ;;;-----------------------------------------------------------
@@ -152,34 +152,34 @@
 
   (define-scenario (cache-restore v)
     "print version (-V flag)"
-    (receive (stdout _) (cache-restore "-V")
+    (run-ok-rcv (stdout _) (cache-restore "-V")
       (assert-equal tools-version stdout)))
 
   (define-scenario (cache-restore version)
     "print version (--version flags)"
-    (receive (stdout _) (cache-restore "--version")
+    (run-ok-rcv (stdout _) (cache-restore "--version")
       (assert-equal tools-version stdout)))
 
   (define-scenario (cache-restore h)
     "cache_restore -h"
-    (receive (stdout _) (cache-restore "-h")
+    (run-ok-rcv (stdout _) (cache-restore "-h")
       (assert-equal cache-restore-help stdout)))
 
   (define-scenario (cache-restore help)
     "cache_restore --help"
-    (receive (stdout _) (cache-restore "--help")
+    (run-ok-rcv (stdout _) (cache-restore "--help")
       (assert-equal cache-restore-help stdout)))
 
   (define-scenario (cache-restore no-input-file)
     "forget to specify an input file"
     (with-empty-metadata (md)
-      (receive (_ stderr) (run-fail "cache_restore" "-o" md)
+      (run-fail-rcv (_ stderr) (cache-restore "-o" md)
         (assert-starts-with "No input file provided." stderr))))
 
   (define-scenario (cache-restore missing-input-file)
     "the input file can't be found"
     (with-empty-metadata (md)
-      (receive (_ stderr) (run-fail "cache_restore -i no-such-file -o" md)
+      (run-fail-rcv (_ stderr) (cache-restore "-i no-such-file -o" md)
         (assert-superblock-untouched md)
         (assert-starts-with "Couldn't stat file" stderr))))
 
@@ -187,33 +187,33 @@
     "the input file is just zeroes"
     (with-empty-metadata (md)
       (with-temp-file-sized ((xml "cache.xml" 4096))
-        (receive (_ stderr) (run-fail "cache_restore -i " xml "-o" md)
+        (run-fail-rcv (_ stderr) (cache-restore "-i" xml "-o" md)
           (assert-superblock-untouched md)))))
 
   (define-scenario (cache-restore missing-output-file)
     "the output file can't be found"
     (with-cache-xml (xml)
-      (receive (_ stderr) (run-fail "cache_restore -i " xml)
+      (run-fail-rcv (_ stderr) (cache-restore "-i" xml)
         (assert-starts-with "No output file provided." stderr))))
 
   (define-scenario (cache-restore tiny-output-file)
     "Fails if the output file is too small."
     (with-temp-file-sized ((md "cache.bin" (* 1024 4)))
       (with-cache-xml (xml)
-        (receive (_ stderr) (run-fail "cache_restore" "-i" xml "-o" md)
+        (run-fail-rcv (_ stderr) (cache-restore "-i" xml "-o" md)
           (assert-starts-with cache-restore-outfile-too-small-text stderr)))))
 
   (define-scenario (cache-restore successfully-restores)
     "Restore succeeds."
     (with-empty-metadata (md)
       (with-cache-xml (xml)
-        (cache-restore "-i" xml "-o" md))))
+        (run-ok (cache-restore "-i" xml "-o" md)))))
 
   (define-scenario (cache-restore q)
     "cache_restore accepts -q"
     (with-empty-metadata (md)
       (with-cache-xml (xml)
-        (receive (stdout stderr) (cache-restore "-i" xml "-o" md "-q")
+        (run-ok-rcv (stdout stderr) (cache-restore "-i" xml "-o" md "-q")
           (assert-eof stdout)
           (assert-eof stderr)))))
 
@@ -221,7 +221,7 @@
     "cache_restore accepts --quiet"
     (with-empty-metadata (md)
       (with-cache-xml (xml)
-        (receive (stdout stderr) (cache-restore "-i" xml "-o" md "--quiet")
+        (run-ok-rcv (stdout stderr) (cache-restore "-i" xml "-o" md "--quiet")
           (assert-eof stdout)
           (assert-eof stderr)))))
 
@@ -229,13 +229,15 @@
     "we can set any metadata version"
     (with-empty-metadata (md)
       (with-cache-xml (xml)
-        (cache-restore "-i" xml "-o" md "--debug-override-metadata-version 10298"))))
+        (run-ok
+          (cache-restore "-i" xml "-o" md "--debug-override-metadata-version 10298")))))
 
   (define-scenario (cache-restore omit-clean-shutdown)
     "accepts --omit-clean-shutdown"
     (with-empty-metadata (md)
       (with-cache-xml (xml)
-        (cache-restore "-i" xml "-o" md "--omit-clean-shutdown"))))
+        (run-ok
+          (cache-restore "-i" xml "-o" md "--omit-clean-shutdown")))))
 
   ;;;-----------------------------------------------------------
   ;;; cache_dump scenarios
@@ -243,41 +245,42 @@
 
   (define-scenario (cache-dump v)
     "print version (-V flag)"
-    (receive (stdout _) (cache-dump "-V")
+    (run-ok-rcv (stdout _) (cache-dump "-V")
       (assert-equal tools-version stdout)))
 
   (define-scenario (cache-dump version)
     "print version (--version flags)"
-    (receive (stdout _) (cache-dump "--version")
+    (run-ok-rcv (stdout _) (cache-dump "--version")
       (assert-equal tools-version stdout)))
 
   (define-scenario (cache-dump h)
     "cache_dump -h"
-    (receive (stdout _) (cache-dump "-h")
+    (run-ok-rcv (stdout _) (cache-dump "-h")
       (assert-equal cache-dump-help stdout)))
 
   (define-scenario (cache-dump help)
     "cache_dump --help"
-    (receive (stdout _) (cache-dump "--help")
+    (run-ok-rcv (stdout _) (cache-dump "--help")
       (assert-equal cache-dump-help stdout)))
 
   (define-scenario (cache-dump missing-input-file)
     "Fails with missing input file."
-    (receive (stdout stderr) (run-fail "cache_dump")
+    (run-fail-rcv (stdout stderr) (cache-dump)
       (assert-starts-with "No input file provided." stderr)))
 
   (define-scenario (cache-dump small-input-file)
     "Fails with small input file"
     (with-temp-file-sized ((md "cache.bin" 512))
-      (run-fail "cache_dump" md)))
+      (run-fail
+        (cache-dump md))))
 
   (define-scenario (cache-dump restore-is-noop)
     "cache_dump followed by cache_restore is a noop."
     (with-valid-metadata (md)
-      (receive (d1-stdout _) (cache-dump md)
+      (run-ok-rcv (d1-stdout _) (cache-dump md)
         (with-temp-file-containing ((xml "cache.xml" d1-stdout))
-          (cache-restore "-i" xml "-o" md)
-          (receive (d2-stdout _) (cache-dump md)
+          (run-ok (cache-restore "-i" xml "-o" md))
+          (run-ok-rcv (d2-stdout _) (cache-dump md)
             (assert-equal d1-stdout d2-stdout))))))
 
   ;;;-----------------------------------------------------------
@@ -286,69 +289,69 @@
 
   (define-scenario (cache-metadata-size v)
     "cache_metadata_size -V"
-    (receive (stdout _) (cache-metadata-size "-V")
+    (run-ok-rcv (stdout _) (cache-metadata-size "-V")
       (assert-equal tools-version stdout)))
 
   (define-scenario (cache-metadata-size version)
     "cache_metadata_size --version"
-    (receive (stdout _) (cache-metadata-size "--version")
+    (run-ok-rcv (stdout _) (cache-metadata-size "--version")
       (assert-equal tools-version stdout)))
 
   (define-scenario (cache-metadata-size h)
     "cache_metadata_size -h"
-    (receive (stdout _) (cache-metadata-size "-h")
+    (run-ok-rcv (stdout _) (cache-metadata-size "-h")
       (assert-equal cache-metadata-size-help stdout)))
 
   (define-scenario (cache-metadata-size help)
     "cache_metadata_size --help"
-    (receive (stdout _) (cache-metadata-size "--help")
+    (run-ok-rcv (stdout _) (cache-metadata-size "--help")
       (assert-equal cache-metadata-size-help stdout)))
 
   (define-scenario (cache-metadata-size no-args)
     "No arguments specified causes fail"
-    (receive (_ stderr) (run-fail "cache_metadata_size")
+    (run-fail-rcv (_ stderr) (cache-metadata-size)
       (assert-equal "Please specify either --device-size and --block-size, or --nr-blocks."
                     stderr)))
 
   (define-scenario (cache-metadata-size device-size-only)
     "Just --device-size causes fail"
-    (receive (_ stderr) (run-fail "cache_metadata_size --device-size" (meg 100))
+    (run-fail-rcv (_ stderr) (cache-metadata-size "--device-size" (meg 100))
       (assert-equal "If you specify --device-size you must also give --block-size."
                     stderr)))
 
   (define-scenario (cache-metadata-size block-size-only)
     "Just --block-size causes fail"
-    (receive (_ stderr) (run-fail "cache_metadata_size --block-size" 128)
+    (run-fail-rcv (_ stderr) (cache-metadata-size "--block-size" 128)
       (assert-equal "If you specify --block-size you must also give --device-size."
                     stderr)))
 
   (define-scenario (cache-metadata-size conradictory-info-fails)
     "Contradictory info causes fail"
-    (receive (_ stderr) (run-fail "cache_metadata_size --device-size 102400 --block-size 1000 --nr-blocks 6")
+    (run-fail-rcv (_ stderr) (cache-metadata-size "--device-size 102400 --block-size 1000 --nr-blocks 6")
       (assert-equal "Contradictory arguments given, --nr-blocks doesn't match the --device-size and --block-size."
                     stderr)))
 
   (define-scenario (cache-metadata-size all-args-agree)
     "All args agreeing succeeds"
-    (receive (stdout stderr) (cache-metadata-size "--device-size" 102400 "--block-size" 100 "--nr-blocks" 1024)
+    (run-ok-rcv (stdout stderr) (cache-metadata-size "--device-size" 102400 "--block-size" 100 "--nr-blocks" 1024)
       (assert-equal "8248 sectors" stdout)
       (assert-eof stderr)))
 
   (define-scenario (cache-metadata-size nr-blocks-alone)
     "Just --nr-blocks succeeds"
-    (receive (stdout stderr) (cache-metadata-size "--nr-blocks" 1024)
+    (run-ok-rcv (stdout stderr) (cache-metadata-size "--nr-blocks" 1024)
       (assert-equal "8248 sectors" stdout)
       (assert-eof stderr)))
 
   (define-scenario (cache-metadata-size dev-size-and-block-size-succeeds)
     "Specifying --device-size with --block-size succeeds"
-    (receive (stdout stderr) (cache-metadata-size "--device-size" 102400 "--block-size" 100)
+    (run-ok-rcv (stdout stderr) (cache-metadata-size "--device-size" 102400 "--block-size" 100)
       (assert-equal "8248 sectors" stdout)
       (assert-eof stderr)))
 
   (define-scenario (cache-metadata-size big-config)
     "A big configuration succeeds"
-    (receive (stdout stderr) (cache-metadata-size "--nr-blocks 67108864")
+    (run-ok-rcv (stdout stderr) (cache-metadata-size "--nr-blocks 67108864")
       (assert-equal "3678208 sectors" stdout)
       (assert-eof stderr)))
 )