Merge branch 'feature/abspath' into feature/apt-install-deb

diff --combined test/libapt/fileutl_test.cc
index 16ea6cf2bdb9c0de6b48cf2e56101dc412652e01,15b57983beaef51b79560eb2ea5d387c4e4b3c68..cdf7ea479a75bf276ce3f58237c4fa859d464b30
--- 1/test/libapt/fileutl_test.cc
--- 2/test/libapt/fileutl_test.cc
+++ b/test/libapt/fileutl_test.cc
@@@ -224,57 -224,14 +224,61 @@@ TEST(FileUtlTest, GetTempDir
     if (old_tmpdir.empty() == false)
        setenv("TMPDIR", old_tmpdir.c_str(), 1);
  }
 +TEST(FileUtlTest, Popen)
 +{
 +   FileFd Fd;
 +   pid_t Child;
 +   char buf[1024];
 +   std::string s;
 +   unsigned long long n = 0;
 +   std::vector<std::string> OpenFds;
 +
 +   // count Fds to ensure we don't have a resource leak
 +   if(FileExists("/proc/self/fd"))
 +      OpenFds = Glob("/proc/self/fd/*");
 +
 +   // output something
 +   const char* Args[10] = {"/bin/echo", "meepmeep", NULL};
 +   bool res = Popen(Args, Fd, Child, FileFd::ReadOnly);
 +   Fd.Read(buf, sizeof(buf)-1, &n);
 +   buf[n] = 0;
 +   EXPECT_NE(n, 0);
 +   EXPECT_EQ(res, true);
 +   EXPECT_STREQ(buf, "meepmeep\n");
 +
 +   // wait for the child to exit and cleanup
 +   ExecWait(Child, "PopenRead");
 +   Fd.Close();
 +
 +   // ensure that after a close all is good again
 +   if(FileExists("/proc/self/fd"))
 +      EXPECT_EQ(Glob("/proc/self/fd/*").size(), OpenFds.size());
 +
 +
 +   // ReadWrite is not supported
 +   res = Popen(Args, Fd, Child, FileFd::ReadWrite);
 +   EXPECT_EQ(res, false);
 +   _error->Discard();
 +
 +   // write something
 +   Args[0] = "/bin/bash";
 +   Args[1] = "-c";
 +   Args[2] = "read";
 +   Args[3] = NULL;
 +   res = Popen(Args, Fd, Child, FileFd::WriteOnly);
 +   s = "\n";
 +   Fd.Write(s.c_str(), s.size());
 +   Fd.Close();
 +   ExecWait(Child, "PopenWrite");
 +}
  TEST(FileUtlTest, flAbsPath)
  {
+    std::string cwd = SafeGetCWD();
     int res = chdir("/bin/");
     EXPECT_EQ(res, 0);
     std::string p = flAbsPath("ls");
     EXPECT_EQ(p, "/bin/ls");
+ 
+    res = chdir(cwd.c_str());
+    EXPECT_EQ(res, 0);
  }