aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-12-02 18:43:27 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-12-02 18:43:27 +0000
commit9d677581c1d4453f195f30ebb6c65133b66ef4c1 (patch)
treea0177728f72b04992d6d13d7ced54593ca355e24
parentfd4316af0f8760722c05f81870137e7066365ab3 (diff)
downloadpaludis-9d677581c1d4453f195f30ebb6c65133b66ef4c1.tar.gz
paludis-9d677581c1d4453f195f30ebb6c65133b66ef4c1.tar.xz
Hide various warnings during tests
-rwxr-xr-xpaludis/environment/default/default_environment_TEST_setup.sh3
-rw-r--r--paludis/environment/no_config/no_config_environment.cc4
-rw-r--r--paludis/qa/qa_environment.cc1
-rw-r--r--paludis/repositories/portage/portage_repository_TEST.cc17
-rw-r--r--paludis/repositories/vdb/vdb_repository_TEST.cc16
-rwxr-xr-xruby/environment_TEST_setup.sh1
-rwxr-xr-xruby/package_database_TEST_setup.sh1
-rwxr-xr-xruby/paludis_ruby_TEST_setup.sh1
-rwxr-xr-xruby/repository_TEST_setup.sh1
-rwxr-xr-xsrc/gtkpaludis/quit_TEST_setup.sh1
-rwxr-xr-xsrc/gtkpaludis/sets_list_TEST_setup.sh1
-rwxr-xr-xsrc/paludis/install_TEST_setup.sh1
-rwxr-xr-xsrc/paludis/upgrade_TEST_setup.sh3
13 files changed, 51 insertions, 0 deletions
diff --git a/paludis/environment/default/default_environment_TEST_setup.sh b/paludis/environment/default/default_environment_TEST_setup.sh
index bb19c8a..48cd9d8 100755
--- a/paludis/environment/default/default_environment_TEST_setup.sh
+++ b/paludis/environment/default/default_environment_TEST_setup.sh
@@ -34,6 +34,7 @@ cat <<END > home1/.paludis/licenses.conf
END
cat <<END > home1/.paludis/repositories/foo.conf
format = portage
+names_cache = /var/empty
location = `pwd`/repo
profiles = `pwd`/repo/profile
cache = /var/empty
@@ -53,6 +54,7 @@ cat <<END > home2/.paludis/licenses.conf
END
cat <<END > home2/.paludis/repositories/foo.conf
format = portage
+names_cache = /var/empty
location = `pwd`/repo
profiles = `pwd`/repo/profile
cache = /var/empty
@@ -72,6 +74,7 @@ cat <<END > home3/.paludis/licenses.conf
END
cat <<END > home3/.paludis/repositories/foo.conf
format = portage
+names_cache = /var/empty
location = `pwd`/repo
profiles = `pwd`/repo/profile
cache = /var/empty
diff --git a/paludis/environment/no_config/no_config_environment.cc b/paludis/environment/no_config/no_config_environment.cc
index 313f630..83fef6f 100644
--- a/paludis/environment/no_config/no_config_environment.cc
+++ b/paludis/environment/no_config/no_config_environment.cc
@@ -165,6 +165,7 @@ Implementation<NoConfigEnvironment>::Implementation(
keys->insert("location", stringify(params.repository_dir));
keys->insert("profiles", stringify(p->path));
keys->insert("write_cache", stringify(params.write_cache));
+ keys->insert("names_cache", "/var/empty");
p->db->add_repository(RepositoryMaker::get_instance()->find_maker("portage")(env,
p->db.raw_pointer(), keys));
@@ -180,6 +181,8 @@ Implementation<NoConfigEnvironment>::Implementation(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "vdb");
+ keys->insert("names_cache", "/var/empty");
+ keys->insert("provides_cache", "/var/empty");
keys->insert("location", stringify(top_level_dir));
vdb_db->add_repository(RepositoryMaker::get_instance()->find_maker("vdb")(env,
@@ -252,6 +255,7 @@ NoConfigEnvironment::set_profile(const FSEntry & location)
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "portage");
+ keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(_imp->top_level_dir));
keys->insert("profiles", stringify(location));
keys->insert("write_cache", stringify(_imp->write_cache));
diff --git a/paludis/qa/qa_environment.cc b/paludis/qa/qa_environment.cc
index a2ba5cf..1a626ad 100644
--- a/paludis/qa/qa_environment.cc
+++ b/paludis/qa/qa_environment.cc
@@ -69,6 +69,7 @@ namespace paludis
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "portage");
+ keys->insert("names_cache", "/var/empty");
keys->insert("importace", "1");
keys->insert("location", stringify(base));
keys->insert("cache", "/var/empty");
diff --git a/paludis/repositories/portage/portage_repository_TEST.cc b/paludis/repositories/portage/portage_repository_TEST.cc
index 80ac322..c62f3d2 100644
--- a/paludis/repositories/portage/portage_repository_TEST.cc
+++ b/paludis/repositories/portage/portage_repository_TEST.cc
@@ -49,6 +49,7 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "portage");
+ keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo1");
keys->insert("profile", "portage_repository_TEST_dir/repo1/profiles/profile");
PortageRepository::Pointer repo(make_ebuild_repository(
@@ -71,6 +72,7 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "portage");
+ keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo2");
keys->insert("profile", "portage_repository_TEST_dir/repo2/profiles/profile");
PortageRepository::Pointer repo(make_ebuild_repository(
@@ -93,6 +95,7 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "portage");
+ keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo3");
keys->insert("profile", "portage_repository_TEST_dir/repo3/profiles/profile");
PortageRepository::Pointer repo(make_ebuild_repository(
@@ -115,6 +118,7 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "portage");
+ keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo1");
keys->insert("profile", "portage_repository_TEST_dir/repo1/profiles/profile");
PortageRepository::Pointer repo(make_ebuild_repository(
@@ -146,6 +150,7 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "portage");
+ keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo1");
keys->insert("profile", "portage_repository_TEST_dir/repo1/profiles/profile");
PortageRepository::Pointer repo(make_ebuild_repository(
@@ -179,6 +184,7 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "portage");
+ keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo4");
keys->insert("profile", "portage_repository_TEST_dir/repo4/profiles/profile");
PortageRepository::Pointer repo(make_ebuild_repository(
@@ -218,6 +224,7 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "portage");
+ keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo4");
keys->insert("profile", "portage_repository_TEST_dir/repo4/profiles/profile");
PortageRepository::Pointer repo(make_ebuild_repository(
@@ -261,6 +268,7 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "portage");
+ keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo4");
keys->insert("profile", "portage_repository_TEST_dir/repo4/profiles/profile");
PortageRepository::Pointer repo(make_ebuild_repository(
@@ -313,6 +321,7 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "portage");
+ keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo5");
keys->insert("profile", "portage_repository_TEST_dir/repo5/profiles/profile");
PortageRepository::Pointer repo(make_ebuild_repository(
@@ -346,6 +355,7 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "portage");
+ keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo4");
keys->insert("profile", "portage_repository_TEST_dir/repo4/profiles/profile");
PortageRepository::Pointer repo(make_ebuild_repository(
@@ -389,6 +399,7 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "portage");
+ keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo4");
keys->insert("profile", "portage_repository_TEST_dir/repo4/profiles/profile");
PortageRepository::Pointer repo(make_ebuild_repository(
@@ -431,6 +442,7 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "portage");
+ keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo8");
keys->insert("profile", "portage_repository_TEST_dir/repo8/profiles/profile");
PortageRepository::Pointer repo(make_ebuild_repository(
@@ -473,6 +485,7 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "portage");
+ keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo6");
keys->insert("profile", "portage_repository_TEST_dir/repo6/profiles/profile");
PortageRepository::Pointer repo(make_ebuild_repository(
@@ -513,6 +526,7 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "portage");
+ keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo7");
keys->insert("profile", "portage_repository_TEST_dir/repo7/profiles/profile");
PortageRepository::Pointer repo(make_ebuild_repository(
@@ -549,6 +563,7 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "portage");
+ keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo7");
keys->insert("profile", "portage_repository_TEST_dir/repo7/profiles/profile");
PortageRepository::Pointer repo(make_ebuild_repository(
@@ -579,6 +594,7 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "portage");
+ keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo9");
keys->insert("profile", "portage_repository_TEST_dir/repo9/profiles/profile");
PortageRepository::Pointer repo(make_ebuild_repository(
@@ -626,6 +642,7 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "portage");
+ keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo10");
keys->insert("profiles", "portage_repository_TEST_dir/repo10/profiles/profile/subprofile");
PortageRepository::Pointer repo(make_ebuild_repository(
diff --git a/paludis/repositories/vdb/vdb_repository_TEST.cc b/paludis/repositories/vdb/vdb_repository_TEST.cc
index 450b118..571a2be 100644
--- a/paludis/repositories/vdb/vdb_repository_TEST.cc
+++ b/paludis/repositories/vdb/vdb_repository_TEST.cc
@@ -49,6 +49,8 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "vdb");
+ keys->insert("names_cache", "/var/empty");
+ keys->insert("provides_cache", "/var/empty");
keys->insert("location", "vdb_repository_TEST_dir/repo1");
VDBRepository::Pointer repo(VDBRepository::make_vdb_repository(
&env, env.package_database().raw_pointer(), keys));
@@ -70,6 +72,8 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "vdb");
+ keys->insert("names_cache", "/var/empty");
+ keys->insert("provides_cache", "/var/empty");
keys->insert("location", "vdb_repository_TEST_dir/repo1");
VDBRepository::Pointer repo(VDBRepository::make_vdb_repository(
&env, env.package_database().raw_pointer(), keys));
@@ -94,6 +98,8 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "vdb");
+ keys->insert("names_cache", "/var/empty");
+ keys->insert("provides_cache", "/var/empty");
keys->insert("location", "vdb_repository_TEST_dir/repo1");
VDBRepository::Pointer repo(VDBRepository::make_vdb_repository(
&env, env.package_database().raw_pointer(), keys));
@@ -124,6 +130,8 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "vdb");
+ keys->insert("names_cache", "/var/empty");
+ keys->insert("provides_cache", "/var/empty");
keys->insert("location", "vdb_repository_TEST_dir/repo1");
keys->insert("world", "vdb_repository_TEST_dir/world-new-file");
VDBRepository::Pointer repo(VDBRepository::make_vdb_repository(
@@ -148,6 +156,8 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "vdb");
+ keys->insert("names_cache", "/var/empty");
+ keys->insert("provides_cache", "/var/empty");
keys->insert("location", "vdb_repository_TEST_dir/repo1");
keys->insert("world", "vdb_repository_TEST_dir/world-empty");
VDBRepository::Pointer repo(VDBRepository::make_vdb_repository(
@@ -172,6 +182,8 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "vdb");
+ keys->insert("names_cache", "/var/empty");
+ keys->insert("provides_cache", "/var/empty");
keys->insert("location", "vdb_repository_TEST_dir/repo1");
keys->insert("world", "vdb_repository_TEST_dir/world-no-match");
VDBRepository::Pointer repo(VDBRepository::make_vdb_repository(
@@ -196,6 +208,8 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "vdb");
+ keys->insert("names_cache", "/var/empty");
+ keys->insert("provides_cache", "/var/empty");
keys->insert("location", "vdb_repository_TEST_dir/repo1");
keys->insert("world", "vdb_repository_TEST_dir/world-match");
VDBRepository::Pointer repo(VDBRepository::make_vdb_repository(
@@ -220,6 +234,8 @@ namespace test_cases
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "vdb");
+ keys->insert("names_cache", "/var/empty");
+ keys->insert("provides_cache", "/var/empty");
keys->insert("location", "vdb_repository_TEST_dir/repo1");
keys->insert("world", "vdb_repository_TEST_dir/world-no-match-no-eol");
VDBRepository::Pointer repo(VDBRepository::make_vdb_repository(
diff --git a/ruby/environment_TEST_setup.sh b/ruby/environment_TEST_setup.sh
index 0be171c..aaede32 100755
--- a/ruby/environment_TEST_setup.sh
+++ b/ruby/environment_TEST_setup.sh
@@ -9,6 +9,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
format = portage
+names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
END
diff --git a/ruby/package_database_TEST_setup.sh b/ruby/package_database_TEST_setup.sh
index 03bd00c..987cf4d 100755
--- a/ruby/package_database_TEST_setup.sh
+++ b/ruby/package_database_TEST_setup.sh
@@ -9,6 +9,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
format = portage
+names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
END
diff --git a/ruby/paludis_ruby_TEST_setup.sh b/ruby/paludis_ruby_TEST_setup.sh
index 29827a7..d43eca2 100755
--- a/ruby/paludis_ruby_TEST_setup.sh
+++ b/ruby/paludis_ruby_TEST_setup.sh
@@ -9,6 +9,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
format = portage
+names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
END
diff --git a/ruby/repository_TEST_setup.sh b/ruby/repository_TEST_setup.sh
index 53c0b46..06cbbd3 100755
--- a/ruby/repository_TEST_setup.sh
+++ b/ruby/repository_TEST_setup.sh
@@ -9,6 +9,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
format = portage
+names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
END
diff --git a/src/gtkpaludis/quit_TEST_setup.sh b/src/gtkpaludis/quit_TEST_setup.sh
index b0cf840..216b4dd 100755
--- a/src/gtkpaludis/quit_TEST_setup.sh
+++ b/src/gtkpaludis/quit_TEST_setup.sh
@@ -9,6 +9,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
format = portage
+names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
END
diff --git a/src/gtkpaludis/sets_list_TEST_setup.sh b/src/gtkpaludis/sets_list_TEST_setup.sh
index f7e2b4c..4d89e89 100755
--- a/src/gtkpaludis/sets_list_TEST_setup.sh
+++ b/src/gtkpaludis/sets_list_TEST_setup.sh
@@ -9,6 +9,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
format = portage
+names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
END
diff --git a/src/paludis/install_TEST_setup.sh b/src/paludis/install_TEST_setup.sh
index b511e8e..f7c1592 100755
--- a/src/paludis/install_TEST_setup.sh
+++ b/src/paludis/install_TEST_setup.sh
@@ -32,6 +32,7 @@ cat <<END > root/${SYSCONFDIR}/paludis/repositories/repo1.conf
location = `pwd`/repo1
cache = /var/empty
format = portage
+names_cache = /var/empty
profiles = \${location}/profiles/testprofile \${location}/profiles/anothertestprofile
buildroot = `pwd`/build
END
diff --git a/src/paludis/upgrade_TEST_setup.sh b/src/paludis/upgrade_TEST_setup.sh
index 52e6958..8069947 100755
--- a/src/paludis/upgrade_TEST_setup.sh
+++ b/src/paludis/upgrade_TEST_setup.sh
@@ -32,6 +32,7 @@ cat <<END > root/${SYSCONFDIR}/paludis/repositories/repo1.conf
location = `pwd`/repo1
cache = /var/empty
format = portage
+names_cache = /var/empty
profiles = \${location}/profiles/testprofile
buildroot = `pwd`/build
END
@@ -39,6 +40,8 @@ END
cat <<END > root/${SYSCONFDIR}/paludis/repositories/installed.conf
location = \${ROOT}/var/db/pkg
format = vdb
+names_cache = /var/empty
+provides_cache = /var/empty
buildroot = `pwd`/build
END