diff options
| author |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2010-08-19 18:50:38 +0100 |
|---|---|---|
| committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2010-08-21 19:57:03 +0100 |
| commit | 9d2310dc1c33aa2417fd3c1ff68ad207bfd569d7 (patch) | |
| tree | f94028e3b08306989c9be1544c7afb43b4aeaa3e | |
| parent | 1857fdf1898ae0d3850cb134b421fc33533e21de (diff) | |
| download | paludis-9d2310dc1c33aa2417fd3c1ff68ad207bfd569d7.tar.gz paludis-9d2310dc1c33aa2417fd3c1ff68ad207bfd569d7.tar.xz | |
tar merger test -> Process
| -rw-r--r-- | paludis/tar_merger_TEST.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/paludis/tar_merger_TEST.cc b/paludis/tar_merger_TEST.cc index 0b6fbc139..10431ccd0 100644 --- a/paludis/tar_merger_TEST.cc +++ b/paludis/tar_merger_TEST.cc @@ -24,7 +24,7 @@ #include <paludis/util/make_named_values.hh> #include <paludis/util/timestamp.hh> #include <paludis/util/set.hh> -#include <paludis/util/system.hh> +#include <paludis/util/process.hh> #include <paludis/util/stringify.hh> #include <paludis/util/make_null_shared_ptr.hh> #include <paludis/hook.hh> @@ -122,9 +122,9 @@ namespace test_cases TEST_CHECK(output.is_regular_file()); TEST_CHECK(output.file_size() > 100); - Command cmd("tar xf ../simple.tar 2>&1"); - cmd.with_chdir(FSEntry("tar_merger_TEST_dir/simple_extract")); - TEST_CHECK_EQUAL(0, run_command(cmd)); + Process untar_process(ProcessCommand({"sh", "-c", "tar xf ../simple.tar 2>&1"})); + untar_process.chdir(FSEntry("tar_merger_TEST_dir/simple_extract")); + TEST_CHECK_EQUAL(0, untar_process.run().wait()); TEST_CHECK((FSEntry("tar_merger_TEST_dir") / "simple_extract" / "file").is_regular_file()); TEST_CHECK_EQUAL((FSEntry("tar_merger_TEST_dir") / "simple_extract" / "file").file_size(), |