From dc7578140ad73f944502732a753e8a6aaedd1649 Mon Sep 17 00:00:00 2001 From: Wouter van Kesteren Date: Fri, 11 Dec 2015 01:17:16 +0100 Subject: Make tests not install to / MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6707744dd5889d6645a28518454f4f190a7f0d27 Reviewed-on: https://galileo.mailstation.de/gerrit/4661 Reviewed-by: Bo Ørsted Andresen --- paludis/repositories/e/e_repository_TEST_pbin.cc | 22 +++++++++++----------- .../repositories/e/e_repository_TEST_pbin_setup.sh | 10 +++++----- .../e/vdb_repository_TEST_eapis_setup.sh | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/paludis/repositories/e/e_repository_TEST_pbin.cc b/paludis/repositories/e/e_repository_TEST_pbin.cc index 5bab3bf3d..fecd05f0a 100644 --- a/paludis/repositories/e/e_repository_TEST_pbin.cc +++ b/paludis/repositories/e/e_repository_TEST_pbin.cc @@ -166,7 +166,7 @@ TEST_P(ERepositoryInstallEAPIPBinTest, Works) id->perform_action(bin_action); } - EXPECT_TRUE(! (root / ("installed-" + base_eapi)).stat().exists()); + EXPECT_TRUE(! (root / "usr" / "share" / ("installed-" + base_eapi)).stat().exists()); b_repo->invalidate(); { @@ -186,7 +186,7 @@ TEST_P(ERepositoryInstallEAPIPBinTest, Works) id->perform_action(install_action); } - EXPECT_TRUE((root / ("installed-" + base_eapi)).stat().exists()); + EXPECT_TRUE((root / "usr" / "share" / ("installed-" + base_eapi)).stat().exists()); } INSTANTIATE_TEST_CASE_P(Works, ERepositoryInstallEAPIPBinTest, testing::Values( @@ -266,9 +266,9 @@ TEST(Symlinks, Works) id->perform_action(bin_action); } - EXPECT_TRUE(! (root / ("symlinks-a")).stat().exists()); - EXPECT_TRUE(! (root / ("symlinks-b")).stat().exists()); - EXPECT_TRUE(! (root / ("symlinks-c")).stat().exists()); + EXPECT_TRUE(! (root / "usr" / "share" / "symlinks-a").stat().exists()); + EXPECT_TRUE(! (root / "usr" / "share" / "symlinks-b").stat().exists()); + EXPECT_TRUE(! (root / "usr" / "share" / "symlinks-c").stat().exists()); b_repo->invalidate(); { @@ -288,12 +288,12 @@ TEST(Symlinks, Works) id->perform_action(install_action); } - EXPECT_TRUE((root / ("symlinks-a")).stat().exists()); - EXPECT_TRUE((root / ("symlinks-b")).stat().exists()); - EXPECT_TRUE((root / ("symlinks-c")).stat().exists()); + EXPECT_TRUE((root / "usr" / "share" / "symlinks-a").stat().exists()); + EXPECT_TRUE((root / "usr" / "share" / "symlinks-b").stat().exists()); + EXPECT_TRUE((root / "usr" / "share" / "symlinks-c").stat().exists()); - EXPECT_TRUE((root / ("symlinks-a")).stat().is_symlink()); - EXPECT_TRUE((root / ("symlinks-b")).stat().is_regular_file()); - EXPECT_TRUE((root / ("symlinks-c")).stat().is_symlink()); + EXPECT_TRUE((root / "usr" / "share" / "symlinks-a").stat().is_symlink()); + EXPECT_TRUE((root / "usr" / "share" / "symlinks-b").stat().is_regular_file()); + EXPECT_TRUE((root / "usr" / "share" / "symlinks-c").stat().is_symlink()); } diff --git a/paludis/repositories/e/e_repository_TEST_pbin_setup.sh b/paludis/repositories/e/e_repository_TEST_pbin_setup.sh index 2e44b1281..0e147d48d 100755 --- a/paludis/repositories/e/e_repository_TEST_pbin_setup.sh +++ b/paludis/repositories/e/e_repository_TEST_pbin_setup.sh @@ -52,7 +52,7 @@ src_unpack() { } src_install() { - insinto / + insinto /usr/share doins installed-${e} } END @@ -122,7 +122,7 @@ src_unpack() { } src_install() { - insinto / + insinto /usr/share doins installed-${e} } END @@ -144,10 +144,10 @@ src_unpack() { } src_install() { - insinto / - dosym symlinks-b symlinks-a + insinto /usr/share + dosym symlinks-b /usr/share/symlinks-a doins symlinks-b - dosym /symlinks-b symlinks-c + dosym /usr/share/symlinks-b /usr/share/symlinks-c find \${IMAGE} | xargs ls -ld } END diff --git a/paludis/repositories/e/vdb_repository_TEST_eapis_setup.sh b/paludis/repositories/e/vdb_repository_TEST_eapis_setup.sh index fe396fbc7..0b7de5f55 100755 --- a/paludis/repositories/e/vdb_repository_TEST_eapis_setup.sh +++ b/paludis/repositories/e/vdb_repository_TEST_eapis_setup.sh @@ -179,7 +179,7 @@ WORK="${WORKBASE}" DEPENDENCIES="" src_install() { - echo MONKEY > ${IMAGE}/monkey + echo MONKEY > ${IMAGE}/usr/share/monkey } pkg_info() { -- cgit v1.2.3