# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1626037899 -7200
# Node ID 9392b442245f4eb194a59d778afc2b62789aa854
# Parent  c294a1c110496036ee566c5eb8b8ab1d482a98fe
Switched the pipe test to use only the client library interface.

diff -r c294a1c11049 -r 9392b442245f conf/dstest_pipe.cfg
--- a/conf/dstest_pipe.cfg	Sun Jul 11 17:51:55 2021 +0200
+++ b/conf/dstest_pipe.cfg	Sun Jul 11 23:11:39 2021 +0200
@@ -16,7 +16,7 @@
 
 l:start({
     caps = {
-      server = server,
+      pipes = server,
     },
     log = { "client", "g" },
   },
diff -r c294a1c11049 -r 9392b442245f tests/dstest_pipe_client.cc
--- a/tests/dstest_pipe_client.cc	Sun Jul 11 17:51:55 2021 +0200
+++ b/tests/dstest_pipe_client.cc	Sun Jul 11 23:11:39 2021 +0200
@@ -30,7 +30,6 @@
 #include <unistd.h> /* sleep */
 
 #include <fsclient/client.h>
-#include <fsclient/file.h>
 #include <mem/memory_utils.h>
 
 
@@ -73,7 +72,7 @@
 
   client_flush(writer);
 
-  file_close(writer);
+  client_close(writer);
 }
 
 /* Use the reader to obtain data from the pipe. */
@@ -150,20 +149,18 @@
     }
   }
 
+  client_close(reader1);
+  client_close(reader2);
+
   printf("Data shown.\n");
 }
 
 int main(void)
 {
-  /* Obtain access to the filesystem. */
-
-  l4_cap_idx_t server = l4re_env_get_cap("server");
+  /* Invoke the open method to receive the pipe endpoint references. */
 
-  /* Invoke the open method to receive the file reference. */
-
-  file_t reader1, reader2, writer1, writer2;
-  long err = pipe_open(page(PIPE_PAGES), &reader1, &writer1, server) ||
-             pipe_open(page(PIPE_PAGES), &reader2, &writer2, server);
+  file_t *reader1, *reader2, *writer1, *writer2;
+  long err = client_pipe(&reader1, &writer1) || client_pipe(&reader2, &writer2);
 
   if (err)
   {
@@ -175,9 +172,9 @@
 
   std::thread *activities[3];
 
-  activities[0] = new std::thread(read_pipes, &reader1, &reader2);
-  activities[1] = new std::thread(write_pipe, &writer1, 1);
-  activities[2] = new std::thread(write_pipe, &writer2, 2);
+  activities[0] = new std::thread(read_pipes, reader1, reader2);
+  activities[1] = new std::thread(write_pipe, writer1, 1);
+  activities[2] = new std::thread(write_pipe, writer2, 2);
 
   for (int i = 0; i < 3; i++)
     activities[i]->join();