commit 9d74eba0f478071a50e371e8e2157ead65eb14f6
author Dmitry Lomov <dslomov@google.com> Thu Nov 26 11:04:01 2015 +0000
committer Philipp Wollermann <philwo@google.com> Thu Nov 26 13:19:56 2015 +0000
tree 449f49bcd530c7d8ca864b210238c02516cdc055
parent 812510c35b6638ddacdd38b9698ea366e69a4174

Actually run standalone-tests on mac and linux.

--
MOS_MIGRATED_REVID=108778201

src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
index 7e483e3..c4baaa2 100644
--- a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
@@ -39,6 +39,7 @@
 import com.google.devtools.build.lib.testutil.TestFileOutErr;
 import com.google.devtools.build.lib.testutil.TestUtils;
 import com.google.devtools.build.lib.util.BlazeClock;
+import com.google.devtools.build.lib.util.OS;
 import com.google.devtools.build.lib.vfs.FileSystem;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.Path;
@@ -120,7 +121,7 @@
   }
 
   public void testBinTrueExecutesFine() throws Exception {
-    Spawn spawn = createSpawn("/bin/true");
+    Spawn spawn = createSpawn(getTrueCommand());
     executor.getSpawnActionContext(spawn.getMnemonic()).exec(spawn, createContext());
 
     assertThat(out()).isEmpty();
@@ -142,7 +143,7 @@
 
   public void testBinFalseYieldsException() throws Exception {
     try {
-      run(createSpawn("/bin/false"));
+      run(createSpawn(getFalseCommand()));
       fail();
     } catch (ExecException e) {
       assertTrue("got: " + e.getMessage(), e
@@ -150,6 +151,15 @@
     }
   }
 
+  private static String getFalseCommand() {
+    return OS.getCurrent() == OS.DARWIN ? "/usr/bin/false" : "/bin/false";
+  }
+
+  private static String getTrueCommand() {
+    return OS.getCurrent() == OS.DARWIN ? "/usr/bin/true" : "/bin/true";
+  }
+
+
   public void testBinEchoPrintsArguments() throws Exception {
     Spawn spawn = createSpawn("/bin/echo", "Hello,", "world.");
     run(spawn);
@@ -189,9 +199,16 @@
 
     try {
       run(spawn);
-      fail("action should fail due to being unable to resolve SDKROOT");
+      if (OS.getCurrent() != OS.DARWIN) {
+        fail("action should fail due to being unable to resolve SDKROOT");
+      }
+
     } catch (ExecException e) {
-      assertThat(e.getMessage()).contains("Cannot locate iOS SDK on non-darwin operating system");
+      if (OS.getCurrent() != OS.DARWIN) {
+        assertThat(e.getMessage()).contains("Cannot locate iOS SDK on non-darwin operating system");
+      } else {
+        fail("This test should pass on OSX.");
+      }
     }
   }
 }