Reduce the fragility of the Sanity Test by not trying to access anything outside...

[controller.git] / opendaylight / distribution / sanitytest / src / main / java / org / opendaylight / controller / distribution / Sanity.java

diff --git a/opendaylight/distribution/sanitytest/src/main/java/org/opendaylight/controller/distribution/Sanity.java b/opendaylight/distribution/sanitytest/src/main/java/org/opendaylight/controller/distribution/Sanity.java
index 378ea8a52d01e15d595da2b91eb7a39a0feafcc7..33ff8ea18a19d84764061ff3aefbb259d1c185d2 100644 (file)
--- a/opendaylight/distribution/sanitytest/src/main/java/org/opendaylight/controller/distribution/Sanity.java
+++ b/opendaylight/distribution/sanitytest/src/main/java/org/opendaylight/controller/distribution/Sanity.java
@@ -1,6 +1,5 @@
 package org.opendaylight.controller.distribution;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -20,19 +19,16 @@ public class Sanity {
 
         System.out.println("Current working directory = " + cwd);
 
-        // We assume that the program is being run from the sanitytest directory
-        // We need to specify the opendaylight directory as the working directory for the shell/batch scripts
-        File processWorkingDir = new File(cwd, "../opendaylight");
-
         String os = System.getProperty("os.name").toLowerCase();
         String script = "./run.sh";
 
         if(os.contains("windows")){
-            script = "run.bat";
+            System.out.println("Sorry no sanity testing on Windows yet");
+            System.exit(0);
+            return;
         }
 
         ProcessBuilder processBuilder = new ProcessBuilder();
-        processBuilder.directory(processWorkingDir.getCanonicalFile());
         processBuilder.command(script);
         Process p = processBuilder.start();