Browse Source

[trac606] added/updated some Makefile.am's so that the tests can be run via make.

JINMEI Tatuya 14 years ago
parent
commit
8be2bf1922
4 changed files with 16 additions and 1 deletions
  1. 6 1
      Makefile.am
  2. 4 0
      configure.ac
  3. 1 0
      tests/Makefile.am
  4. 5 0
      tests/system/Makefile.am

+ 6 - 1
Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = doc src
+SUBDIRS = doc src tests
 USE_LCOV=@USE_LCOV@
 LCOV=@LCOV@
 GENHTML=@GENHTML@
@@ -77,6 +77,11 @@ cppcheck:
 		--template '{file}:{line}: check_fail: {message} ({severity},{id})' \
 		src
 
+# system tests
+systest:
+	cd tests/system; \
+	sh runall.sh
+
 #### include external sources in the distributed tarball:
 EXTRA_DIST = ext/asio/README
 EXTRA_DIST += ext/asio/asio/local/stream_protocol.hpp

+ 4 - 0
configure.ac

@@ -689,6 +689,8 @@ AC_CONFIG_FILES([Makefile
                  src/lib/cache/tests/Makefile
                  src/lib/server_common/Makefile
                  src/lib/server_common/tests/Makefile
+                 tests/Makefile
+                 tests/system/Makefile
                ])
 AC_OUTPUT([doc/version.ent
            src/bin/cfgmgr/b10-cfgmgr.py
@@ -747,6 +749,8 @@ AC_OUTPUT([doc/version.ent
            src/lib/cc/tests/session_unittests_config.h
            src/lib/log/tests/run_time_init_test.sh
            tests/system/conf.sh
+           tests/system/glue/setup.sh
+           tests/system/glue/nsx1/b10-config.db
           ], [
            chmod +x src/bin/cmdctl/run_b10-cmdctl.sh
            chmod +x src/bin/xfrin/run_b10-xfrin.sh

+ 1 - 0
tests/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS = system

+ 5 - 0
tests/system/Makefile.am

@@ -0,0 +1,5 @@
+systest:
+	sh runall.sh
+
+distclean-local:
+	sh cleanall.sh