tests: Drop /private CWD prefix in commandhelper

/tmp is a symbolic link to /private/tmp on macOS. That causes failures
in commandtest, because getcwd returns /private/tmp and the expected
output doesn't match to "CWD: /tmp".

Rathern than making a copy of commanddata solely for macOS, the /private
prefix is stripped.

Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>

diff --git a/tests/commandhelper.c b/tests/commandhelper.c
index 1312f3ee527c82c78e22d7e76e5d9a8c07e010d7..872564b1444231ec0bd76f60374b18e289b32a91 100644 (file)
--- a/tests/commandhelper.c
+++ b/tests/commandhelper.c
@@ -130,7 +130,16 @@ int main(int argc, char **argv) {
     if (strlen(cwd) > strlen(".../commanddata") &&
         STREQ(cwd + strlen(cwd) - strlen("/commanddata"), "/commanddata"))
         strcpy(cwd, ".../commanddata");
+# ifdef __APPLE__
+    char *noprivateprefix = NULL;
+    if (strstr(cwd, "/private"))
+        noprivateprefix = cwd + strlen("/private");
+    else
+        noprivateprefix = cwd;
+    fprintf(log, "CWD:%s\n", noprivateprefix);
+# else
     fprintf(log, "CWD:%s\n", cwd);
+# endif
     free(cwd);
 
     fprintf(log, "UMASK:%04o\n", umask(0));