X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libsysio%2Ftests%2FMakefile.am;h=2901e5a52c380d2c15bc26cd3c15f8cd24b85cc9;hb=5ad45a6b28a1a4da6f22a508c0a5029c4db5e4b5;hp=85c43041f5ad983c313835f79dde407b455b216d;hpb=b8292c00324fbe9a25910ce53d03569186ea3e2c;p=fs%2Flustre-release.git

diff --git a/libsysio/tests/Makefile.am b/libsysio/tests/Makefile.am
index 85c4304..2901e5a 100644
--- a/libsysio/tests/Makefile.am
+++ b/libsysio/tests/Makefile.am
@@ -1,6 +1,7 @@
 noinst_PROGRAMS = test_copy test_stats test_path test_list \
-	test_getcwd test_link test_unlink test_rename \
-	test_regions test_driver
+	test_getcwd test_link test_unlink test_symlink test_rename \
+	test_regions test_stddir test_fcntl_lock test_mknod test_mkdir \
+	test_chown
 
 CLEANFILES=drv_data.c
 
@@ -28,27 +29,12 @@ YOD_DRIVER_NAME=
 YOD_DRIVER_CFLAGS=
 endif
 
-if WITH_SOCKETS_DRIVER
-SOCKETS_DRIVER_NAME=sockets
-SOCKETS_DRIVER_CFLAGS= -I$(top_srcdir)/drivers/sockets
-else
-SOCKETS_DRIVER_NAME=
-SOCKETS_DRIVER_CFLAGS=
-endif
-
 DRIVERS=$(NATIVE_DRIVER_NAME) $(INCORE_DRIVER_NAME) $(YOD_DRIVER_NAME) \
-	$(STFD_DEV_NAME) $(SOCKETS_DRIVER_NAME)
+	$(STFD_DEV_NAME)
 
 CMNSRC=startup.c drv_init_all.c drv_data.c
 
 BUILT_SOURCES=drv_data.c
-check_PROGRAMS=test_driver
-if TEST_ALPHA_ARG
-TESTS_ENVIRONMENT=IS_ALPHA=yes
-else
-TESTS_ENVIRONMENT=IS_ALPHA=no
-endif
-TESTS=test_all.pl
 
 CFL=$(AM_CFLAGS) $(AM_CPPFLAGS) \
 	$(NATIVE_DRIVER_CFLAGS) $(INCORE_DRIVER_CFLAGS) \
@@ -58,57 +44,71 @@ LIBS=$(LIBBUILD_DIR)/libsysio.a
 
 test_copy_SOURCES=test_copy.c $(CMNSRC)
 test_copy_CFLAGS=$(CFL)
-test_copy_LDADD=$(LIBS)
 test_copy_DEPENDENCIES=$(LIBS)
 
 test_stats_SOURCES=test_stats.c $(CMNSRC)
 test_stats_CFLAGS=$(CFL)
-test_stats_LDADD=$(LIBS)
 test_stats_DEPENDENCIES=$(LIBS)
 
 test_path_SOURCES=test_path.c $(CMNSRC)
 test_path_CFLAGS=$(CFL)
-test_path_LDADD=$(LIBS)
 test_path_DEPENDENCIES=$(LIBS)
 
 test_list_SOURCES=test_list.c $(CMNSRC)
 test_list_CFLAGS=$(CFL)
-test_list_LDADD=$(LIBS)
 test_list_DEPENDENCIES=$(LIBS)
 
 test_getcwd_SOURCES=test_getcwd.c $(CMNSRC)
 test_getcwd_CFLAGS=$(CFL)
-test_getcwd_LDADD=$(LIBS)
 test_getcwd_DEPENDENCIES=$(LIBS)
 
 test_link_SOURCES=test_link.c $(CMNSRC)
 test_link_CFLAGS=$(CFL)
-test_link_LDADD=$(LIBS)
 test_link_DEPENDENCIES=$(LIBS)
 
 test_unlink_SOURCES=test_unlink.c $(CMNSRC)
 test_unlink_CFLAGS=$(CFL)
-test_unlink_LDADD=$(LIBS)
 test_unlink_DEPENDENCIES=$(LIBS)
 
+test_symlink_SOURCES=test_symlink.c $(CMNSRC)
+test_symlink_CFLAGS=$(CFL)
+test_symlink_DEPENDENCIES=$(LIBS)
+
 test_rename_SOURCES=test_rename.c $(CMNSRC)
 test_rename_CFLAGS=$(CFL)
-test_rename_LDADD=$(LIBS)
 test_rename_DEPENDENCIES=$(LIBS)
 
 test_regions_SOURCES=test_regions.c $(CMNSRC)
 test_regions_CFLAGS=$(CFL)
-test_regions_LDADD=$(LIBS)
 test_regions_DEPENDENCIES=$(LIBS)
 
-test_driver_SOURCES=test_driver.c sysio_tests.c sysio_stubs.c help.c $(CMNSRC)
-test_driver_CFLAGS=$(CFL)
-test_driver_LDADD=$(LIBS)
-test_driver_DEPENDENCIES=$(LIBS)
+test_stddir_SOURCES=test_stddir.c $(CMNSRC)
+test_stddir_CFLAGS=$(CFL)
+test_stddir_DEPENDENCIES=$(LIBS)
+
+test_fcntl_lock_SOURCES=test_fcntl_lock.c $(CMNSRC)
+test_fcntl_lock_CFLAGS=$(CFL)
+test_fcntl_lock_DEPENDENCIES=$(LIBS)
+
+test_mknod_SOURCES=test_mknod.c $(CMNSRC)
+test_mknod_CFLAGS=$(CFL)
+test_mknod_DEPENDENCIES=$(LIBS)
+
+test_mkdir_SOURCES=test_mkdir.c $(CMNSRC)
+test_mkdir_CFLAGS=$(CFL)
+test_mkdir_DEPENDENCIES=$(LIBS)
+
+test_chown_SOURCES=test_chown.c $(CMNSRC)
+test_chown_CFLAGS=$(CFL)
+test_chown_DEPENDENCIES=$(LIBS)
 
 drv_data.c: $(CONFIG_DEPENDENCIES) $(top_srcdir)/tests/gendrvdata.sh
 	test -z "drv_data.c" && rm -f drv_data.c; \
 	$(SHELL) $(top_srcdir)/tests/gendrvdata.sh $(DRIVERS) > drv_data.c
 
+lib_LIBRARIES=libruntime.a
+
+libruntime_a_SOURCES=sysio-run-start.c startup.c drv_init_all.c drv_data.c
+
 AM_CFLAGS = -L$(LIBBUILD_DIR)
 include $(top_srcdir)/Rules.make