commit af02ae7eb9dc8d2be7a35048f9b0034540f69765
author Jorge Lucangeli Obes <jorgelo@google.com> Tue Dec 01 09:14:22 2015 -0800
committer Jorge Lucangeli Obes <jorgelo@google.com> Tue Dec 01 09:14:22 2015 -0800
tree 61708521d15bfd575c45c7718f1b92617e3411ef
parent c2ba9f5bf14b1e126efbf6c221dce2a93a01bc3a

Fix libminijail_unittest.

Executable paths were wrong.

Bug: 25892333
Change-Id: Ice7f56c36f58969da52617daa89bca01abb47850

libminijail_unittest.c

diff --git a/libminijail_unittest.c b/libminijail_unittest.c
index d6de3c7..4591ed4 100644
--- a/libminijail_unittest.c
+++ b/libminijail_unittest.c
@@ -151,7 +151,11 @@
   const size_t buf_len = 128;
   char buf[buf_len];
   int status;
+#if defined(__ANDROID__)
+  char filename[] = "/system/bin/cat";
+#else
   char filename[] = "/bin/cat";
+#endif
   char teststr[] = "test\n";
   size_t teststr_len = strlen(teststr);
   char *argv[4];
@@ -179,7 +183,11 @@
   ASSERT_TRUE(WIFSIGNALED(status));
   EXPECT_EQ(WTERMSIG(status), SIGTERM);
 
+#if defined(__ANDROID__)
+  argv[0] = "/system/bin/sh";
+#else
   argv[0] = "/bin/sh";
+#endif
   argv[1] = "-c";
   argv[2] = "echo test >&2";
   argv[3] = NULL;