diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/.gitignore | 2 | ||||
| -rw-r--r-- | test/Makefile.am | 8 | ||||
| -rw-r--r-- | test/bin-common/option-action.cc | 14 |
3 files changed, 12 insertions, 12 deletions
diff --git a/test/.gitignore b/test/.gitignore index 823f7b8c..813b6a75 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -19,5 +19,5 @@ sbuild/personality sbuild/regex sbuild/run-parts sbuild/util -schroot-base/option-action +bin-common/option-action diff --git a/test/Makefile.am b/test/Makefile.am index 204b6791..cd31cd88 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -40,7 +40,7 @@ noinst_PROGRAMS += \ test/sbuild/regex \ test/sbuild/run-parts \ test/sbuild/util \ - test/schroot-base/option-action + test/bin-common/option-action # sbuild-lock is excluded, because it is timing dependent and can fail # randomly on slow or heavily-loaded systems. @@ -65,7 +65,7 @@ TESTS = test/setup-test-data \ test/sbuild/run-parts \ test/sbuild/regex \ test/sbuild/util \ - test/schroot-base/option-action \ + test/bin-common/option-action \ test/cleanup-test-data endif @@ -172,8 +172,8 @@ test_sbuild_run_parts_LDADD = lib/test/libtest.la test_sbuild_util_SOURCES = test/sbuild/util.cc test_sbuild_util_LDADD = lib/test/libtest.la -test_schroot_base_option_action_SOURCES = test/schroot-base/option-action.cc -test_schroot_base_option_action_LDADD = $(top_builddir)/lib/schroot-base/libschroot-base.la lib/test/libtest.la +test_bin_common_option_action_SOURCES = test/bin-common/option-action.cc +test_bin_common_option_action_LDADD = $(top_builddir)/lib/bin-common/libbin-common.la lib/test/libtest.la EXTRA_DIST += \ test/keyfile.ex1 \ diff --git a/test/bin-common/option-action.cc b/test/bin-common/option-action.cc index 4f3bb8bb..18e0c73c 100644 --- a/test/bin-common/option-action.cc +++ b/test/bin-common/option-action.cc @@ -16,14 +16,14 @@ * *********************************************************************/ -#include <schroot-base/option-action.h> -#include <schroot-base/options.h> +#include <bin-common/option-action.h> +#include <bin-common/options.h> #include <iostream> #include <cppunit/extensions/HelperMacros.h> -using schroot_base::option_action; +using bin_common::option_action; using namespace CppUnit; class test_option_action : public TestFixture @@ -31,14 +31,14 @@ class test_option_action : public TestFixture CPPUNIT_TEST_SUITE(test_option_action); CPPUNIT_TEST(test_construction); CPPUNIT_TEST(test_default); - CPPUNIT_TEST_EXCEPTION(test_default_fail, schroot_base::options::error); + CPPUNIT_TEST_EXCEPTION(test_default_fail, bin_common::options::error); CPPUNIT_TEST(test_current); - CPPUNIT_TEST_EXCEPTION(test_current_fail, schroot_base::options::error); + CPPUNIT_TEST_EXCEPTION(test_current_fail, bin_common::options::error); CPPUNIT_TEST_EXCEPTION(test_current_fail_multipleset, - schroot_base::options::error); + bin_common::options::error); CPPUNIT_TEST(test_operators); CPPUNIT_TEST_EXCEPTION(test_operators_fail_multipleset, - schroot_base::options::error); + bin_common::options::error); CPPUNIT_TEST_SUITE_END(); protected: |