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

Change-Id: I4f563ae82becde73ff412aeddc159cf7c7051433
Signed-off-by: Moiz Raja <moraja@cisco.com>

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index 74d2b74f11059159a6ca5f78ad95bbd724fdf924..905e3a4eca3d0f48117d5d6877fb37617cc5b113 100644 (file)
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -1063,10 +1063,9 @@
             <executable>java</executable>
             <arguments>
                 <argument>-cp</argument>
-                <argument>../sanitytest/target/classes</argument>
+                <argument>./target/dependency/*</argument>
                 <argument>org.opendaylight.controller.distribution.Sanity</argument>
             </arguments>
-            <workingDirectory>${exec.workingdir}/../../sanitytest</workingDirectory>
           </configuration>
       </plugin>
     </plugins>

diff --git a/opendaylight/distribution/opendaylight/src/main/resources/run.sh b/opendaylight/distribution/opendaylight/src/main/resources/run.sh
index 6caf3e3f57c55aa0f3c2d88f70e43dde7de355b8..31bf3c6632158ecc532566c8275fa00e07d28800 100755 (executable)
--- a/opendaylight/distribution/opendaylight/src/main/resources/run.sh
+++ b/opendaylight/distribution/opendaylight/src/main/resources/run.sh
@@ -10,6 +10,9 @@ fi
 
 if [[ $platform == 'linux' ]]; then
    fullpath=`readlink -f $0`
+
+   [[ -z ${JAVA_HOME} ]] && [[ -x "/usr/lib/jvm/java-1.7.0" ]] && export JAVA_HOME=`/usr/lib/jvm/java-1.7.0`;
+
 elif [[ $platform == 'osx' ]]; then
    TARGET_FILE=$0
    cd `dirname $TARGET_FILE`

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();