!32 Improve test_all and listdir

goldfish/liii/list.scm

@@ -18,7 +18,7 @@
 (export list-view
   take drop take-right drop-right count fold fold-right reduce reduce-right
   filter partition remove find delete take-while drop-while list-index last-pair
-  last)
+  last flatmap)
 (import (srfi srfi-1))
 (begin
 
@@ -35,6 +35,9 @@
                        "list-view only accepts even number of args"))))
   f-inner)
 
+(define (flatmap f seq)
+  (fold-right append () (map f seq)))
+
 ) ; end of begin
 ) ; end of library
 

src/goldfish.hpp

@@ -260,6 +260,12 @@ f_listdir (s7_scheme* sc, s7_pointer args) {
   vector<string> entries;
   s7_pointer     ret= s7_make_vector (sc, 0);
   tb_directory_walk (path_c, 0, tb_false, tb_directory_walk_func, &entries);
+
+  int entries_N= entries.size ();
+  int path_N   = string (path_c).size ();
+  for (int i= 0; i < entries_N; i++) {
+    entries[i]= entries[i].substr (path_N + 1);
+  }
   return string_vector_to_s7_vector (sc, entries);
 }
 

tests/liii/string-test.scm

@@ -17,7 +17,4 @@
 (import (liii check)
         (liii error))
 
-(check (mk-string " " (list 1 2 3)) => "1 2 3")
-(check (mk-string " " (list )) => "")
-
 (check-report)

tests/test_all.scm

@@ -14,20 +14,22 @@
 ; under the License.
 ;
 
-(import (liii os)
+(import (liii list)
+        (liii string)
+        (liii os)
         (srfi srfi-1))
 
+(define (listdir2 dir)
+  (map (lambda (x) (string-append dir "/" x))
+    (vector->list (listdir dir))))
+
+; (display (listdir2 "tests"))
 (define (all-tests)
-  (list
-    "tests/scheme/boot-test.scm"
-    "tests/scheme/case-lambda-test.scm"
-    "tests/scheme/process-context-test.scm"
-    "tests/srfi/srfi-8-test.scm"
-    "tests/srfi/srfi-9-test.scm"
-    "tests/srfi/srfi-16-test.scm"
-    "tests/srfi/srfi-39-test.scm"
-    "tests/liii/os-test.scm"
-    "tests/liii/uuid-test.scm"))
+  (((apply list-view (listdir2 "tests"))
+    filter isdir
+    flatmap listdir2
+    filter (lambda (x) (not (isdir x)))
+    filter (lambda (x) (not (string-suffix? "srfi-78-test.scm" x))))))
 
 (define (goldfish-cmd)
   (if (os-windows?)