# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1666565728 -7200
# Node ID 68f7cfde593b5ff453258599d48c1147148d0396
# Parent  c611cf130c52e2ed4840dbeb617a768a4dcf2069
Improved test program behaviour and diagnostics.

diff -r c611cf130c52 -r 68f7cfde593b tests/dstest_file_readdir_concurrent.cc
--- a/tests/dstest_file_readdir_concurrent.cc	Sun Oct 23 21:53:01 2022 +0200
+++ b/tests/dstest_file_readdir_concurrent.cc	Mon Oct 24 00:55:28 2022 +0200
@@ -38,6 +38,7 @@
 
   if (!client_opened(reader))
   {
+    printf("Failed to open %s: %s\n", filename, reader != NULL ? l4sys_errtostr(reader->error) : "(no reader)");
     client_close(reader);
     return 1;
   }
diff -r c611cf130c52 -r 68f7cfde593b tests/dstest_file_rename.cc
--- a/tests/dstest_file_rename.cc	Sun Oct 23 21:53:01 2022 +0200
+++ b/tests/dstest_file_rename.cc	Mon Oct 24 00:55:28 2022 +0200
@@ -59,6 +59,8 @@
     free(dirent);
   }
 
+  client_close(reader);
+
   printf("Directory shown.\n");
 
   printf("Renamed files: %d (%d)\n", renamed, expected);
@@ -69,6 +71,11 @@
   return 0;
 }
 
+static size_t max(size_t a, size_t b)
+{
+  return a >= b ? a : b;
+}
+
 int main(int argc, char *argv[])
 {
   if (argc < 3)
@@ -81,31 +88,13 @@
 
   printf("Opening %s...\n", filename);
 
-  file_t *reader = client_opendir(filename);
-
-  if (!client_opened(reader))
-  {
-    client_close(reader);
-    printf("Could not read from directory.\n");
-    return 1;
-  }
-
-  printf("Reading...\n");
-
-  struct dirent *dirent;
-
-  while ((dirent = client_readdir(reader)) != NULL)
-  {
-    printf("> %s\n", dirent->d_name);
-    free(dirent);
-  }
-
-  printf("Directory shown.\n");
+  show_directory(filename, 0);
 
   /* Rename some files. */
 
-  char source[strlen(filename) + strlen("/file-XXXX.txt") + 10];
-  char target[strlen(filename) + strlen("/file-XXXX.txt") + 10];
+  size_t namelen = max(strlen(filename), strlen(newdir));
+  char source[namelen + strlen("/renamed-XXXX.txt") + 10];
+  char target[namelen + strlen("/renamed-XXXX.txt") + 10];
   int filenum, to_rename = 100;
   long err;
 
@@ -118,7 +107,7 @@
 
     if (err)
     {
-      printf("Could not rename file: %s\n", source);
+      printf("Could not rename file %s: %s\n", source, l4sys_errtostr(err));
       return 1;
     }
   }
@@ -138,6 +127,9 @@
     return 1;
   }
 
+  file_t *reader;
+  struct dirent *dirent;
+
   reader = client_opendir(filename);
 
   if (!client_opened(reader))
@@ -160,7 +152,7 @@
 
       if (err)
       {
-        printf("Could not rename file: %s\n", source);
+        printf("Could not rename file %s: %s\n", source, l4sys_errtostr(err));
         return 1;
       }
     }
@@ -168,6 +160,8 @@
     free(dirent);
   }
 
+  client_close(reader);
+
   /* Show the new directory's listing. */
 
   if (show_directory(newdir, to_rename))