diff options
author | Tobias Brunner <tobias@strongswan.org> | 2013-01-17 17:00:05 +0100 |
---|---|---|
committer | Tobias Brunner <tobias@strongswan.org> | 2013-01-17 17:00:05 +0100 |
commit | 0c006341f3789477c429cdfb547ad5ec59819bbf (patch) | |
tree | b11eda6dc752549be59cc5406887ae4b404e4aa8 /testing/Makefile.am | |
parent | 1449e6dd55892c92e502a14dbfc3ede094aaa806 (diff) | |
parent | 737912239f625dcfa1c26924430d8ceb033184dd (diff) | |
download | strongswan-0c006341f3789477c429cdfb547ad5ec59819bbf.tar.bz2 strongswan-0c006341f3789477c429cdfb547ad5ec59819bbf.tar.xz |
Merge branch 'debian-testing'
These changes update the integration test system. It previously was based
on a pretty much unmaintainable Gentoo root image and the dated UML
virtualization technology. Among many other changes the test environment
is now based on KVM and uses reproducible Debian-based guest images.
Conflicts:
NEWS
Diffstat (limited to 'testing/Makefile.am')
-rw-r--r-- | testing/Makefile.am | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/testing/Makefile.am b/testing/Makefile.am index 2aa7d70bc..49831a570 100644 --- a/testing/Makefile.am +++ b/testing/Makefile.am @@ -1,11 +1,4 @@ -noinst_SCRIPTS = do-tests -CLEANFILES = do-tests -EXTRA_DIST = do-tests.in make-testing start-testing stop-testing \ - testing.conf ssh_config hosts images scripts tests INSTALL README - -do-tests : do-tests.in - sed \ - -e "s:\@routing_table\@:$(routing_table):" \ - $(srcdir)/$@.in > $@ - chmod +x $@ +EXTRA_DIST = do-tests make-testing start-testing stop-testing \ + testing.conf ssh_config config hosts images scripts tests \ + INSTALL README |