[Libsysio-commit] HEAD: libsysio/tests Makefile.am startup.c

[Lee W. <lw...@us...>]

Update of /cvsroot/libsysio/libsysio/tests
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18012/tests

Modified Files:
	Makefile.am startup.c 
Log Message:


Altered tracing support to include a format now.

Re-introducing _HAVE_STATVFS6 for binary compatibility.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/libsysio/libsysio/tests/Makefile.am,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -w -b -B -p -r1.29 -r1.30
--- Makefile.am	30 Apr 2007 23:24:13 -0000	1.29
+++ Makefile.am	2 Jul 2007 18:58:18 -0000	1.30
@@ -1,7 +1,13 @@
+if WITH_STATVFS
+STATVFS_PROG=test_statvfs
+else
+STATVFS_PROG=
+endif
+
 noinst_PROGRAMS = test_copy test_stats test_path test_list \
 	test_getcwd test_link test_unlink test_symlink test_rename \
 	test_regions test_stddir test_fcntl_lock test_mknod test_mkdir \
-	test_chown test_statvfs
+	test_chown $(STATVFS_PROG)
 
 CLEANFILES=drv_data.c
 

Index: startup.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/tests/startup.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -b -B -p -r1.13 -r1.14
--- startup.c	1 May 2007 16:33:53 -0000	1.13
+++ startup.c	2 Jul 2007 18:58:18 -0000	1.14
@@ -21,15 +21,6 @@ _test_sysio_startup()
 	err = drv_init_all();
 	if (err)
 		return err;
-#ifdef SYSIO_TRACING
-	/*
-	 * tracing
-	 */
-	arg = getenv("SYSIO_TRACING");
-	err = _sysio_boot("trace", arg);
-	if (err)
-		return err;
-#endif
 	/*
 	 * namespace
 	 */
@@ -54,6 +45,15 @@ _test_sysio_startup()
 	if (err)
 		return err;
 #endif
+#ifdef SYSIO_TRACING
+	/*
+	 * tracing
+	 */
+	arg = getenv("SYSIO_TRACING");
+	err = _sysio_boot("trace", arg);
+	if (err)
+		return err;
+#endif
 	return 0;
 }