X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libsysio%2Ftests%2Fstartup.c;h=033b325ce9ab328727a16ddf8d22cb1e32b7e4b1;hb=8c83e7d75989ef527e43a824a0dbe46bffabd07d;hp=82a92cbea557574faf66be5a4f6f90fc8375c0d8;hpb=8692f4651696ff4324db3ad738d3fa62f68d7347;p=fs%2Flustre-release.git

diff --git a/libsysio/tests/startup.c b/libsysio/tests/startup.c
index 82a92cb..033b325 100644
--- a/libsysio/tests/startup.c
+++ b/libsysio/tests/startup.c
@@ -4,16 +4,16 @@
 #include <sys/types.h>
 #include <sys/queue.h>
 
-#include "xtio.h"
 #include "test.h"
 
 #include "sysio.h"
+#include "xtio.h"
 
 int
 _test_sysio_startup()
 {
 	int	err;
-	const char *s;
+	char	*arg;
 
 	err = _sysio_init();
 	if (err)
@@ -21,25 +21,39 @@ _test_sysio_startup()
 	err = drv_init_all();
 	if (err)
 		return err;
-	s = getenv("SYSIO_NAMESPACE");
-	if (s)
-		err = _sysio_boot(s);
-	else if (!(s = getenv("SYSIO_MANUAL"))) {
+#ifdef SYSIO_TRACING
+	/*
+	 * tracing
+	 */
+	arg = getenv("SYSIO_TRACING");
+	err = _sysio_boot("trace", arg);
+	if (err)
+		return err;
+#endif
+	/*
+	 * namespace
+	 */
+	arg = getenv("SYSIO_NAMESPACE");
+	if (!(arg || (arg = getenv("SYSIO_MANUAL")))) {
 		/*
-		 * Assume a native mount at root.
+		 * Assume a native mount at root with automounts enabled.
 		 */
-		err = _sysio_boot("{mnt,dev=\"native:/\",dir=/,fl=0}");
+		arg = "{mnt,dev=\"native:/\",dir=/,fl=2}";
 	}
+	err = _sysio_boot("namespace", arg);
 	if (err)
 		return err;
-
-	s = getenv("SYSIO_CWD");
-	if (s) {
-		err = chdir(s);
-		if (err)
-			return err;
-	}
-
+#ifdef DEFER_INIT_CWD
+	/*
+	 * Current working directory.
+	 */
+	arg = getenv("SYSIO_CWD");
+	if (!arg)
+		arg = "/";
+	err = _sysio_boot("cwd", arg);
+	if (err)
+		return err;
+#endif
 	return 0;
 }