SQUASH ME: Add detail to error messages.

bigdatagenomics · Dec 23, 2016 · bdc90a8 · bdc90a8
1 parent 70fe5da
commit bdc90a8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/scripts/jenkins-test b/scripts/jenkins-test
@@ -44,14 +44,14 @@ echo "Rewriting POM.xml files to Scala 2.10 and Spark 1 should error..."
 ./scripts/move_to_spark_1.sh
 if [[ $? == 0 ]];
 then
-    echo "Moving to Spark 1 did not cowardly fail!"
+    echo "Running move_to_spark_1.sh when POMs are set up for Spark 1 should fail, but error code was 0 (success)."
     exit 1
 fi
 
 ./scripts/move_to_scala_2.10.sh
 if [[ $? == 0 ]];
 then
-    echo "Moving to Scala 2.10 did not cowardly fail!"
+    echo "Running move_to_scala_2.10.sh when POMs are set up for Scala 2.10 should fail, but error code was 0 (success)."
     exit 1
 fi
 
@@ -69,7 +69,7 @@ then
     ./scripts/move_to_spark_2.sh
     if [[ $? == 0 ]];
     then
-        echo "Moving to Spark 2 twice did not cowardly fail!"
+        echo "We have already moved to Spark 2, so running move_to_spark_2.sh a second time should fail, but error code was 0 (success)."
         exit 1
     fi
     set -e
@@ -86,7 +86,7 @@ then
     ./scripts/move_to_scala_2.11.sh
     if [[ $? == 0 ]];
     then
-        echo "Moving to Scala 2.11 twice did not cowardly fail!"
+        echo "We have already moved to Scala 2.11, so running move_to_scala_2.11.sh a second time should fail, but error code was 0 (success)."
         exit 1
     fi
     set -e

diff --git a/scripts/move_to_scala_2.10.sh b/scripts/move_to_scala_2.10.sh
@@ -5,8 +5,8 @@ set +x
 grep "<scala\.version>" pom.xml | grep -q 2.10
 if [[ $? == 0 ]];
 then
-    echo "Scala version is already set to 2.10."
-    echo "Cowardly refusing to move to Scala 2.10..."
+    echo "Scala version is already set to 2.10 (Scala artifacts have _2.10 version suffix in artifact name)."
+    echo "Cowardly refusing to move to Scala 2.10 a second time..."
 
     exit 1
 fi

diff --git a/scripts/move_to_scala_2.11.sh b/scripts/move_to_scala_2.11.sh
@@ -5,8 +5,8 @@ set +x
 grep "<scala\.version>" pom.xml | grep -q 2.11
 if [[ $? == 0 ]];
 then
-    echo "Scala version is already set to 2.11."
-    echo "Cowardly refusing to move to Scala 2.11..."
+    echo "Scala version is already set to 2.11 (Scala artifacts have _2.11 version suffix in artifact name)."
+    echo "Cowardly refusing to move to Scala 2.11 a second time..."
 
     exit 1
 fi

diff --git a/scripts/move_to_spark_1.sh b/scripts/move_to_spark_1.sh
@@ -5,8 +5,8 @@ set +x
 grep -q "spark2" pom.xml
 if [[ $? == 1 ]];
 then
-    echo "POM is already set up for Spark 1."
-    echo "Cowardly refusing to move to Spark 1..."
+    echo "POM is already set up for Spark 1 (Spark 1/2 artifacts are missing -spark2 suffix in artifact names)."
+    echo "Cowardly refusing to move to Spark 1 a second time..."
 
     exit 1
 fi

diff --git a/scripts/move_to_spark_2.sh b/scripts/move_to_spark_2.sh
@@ -5,8 +5,8 @@ set +x
 grep -q "spark2" pom.xml
 if [[ $? == 0 ]];
 then
-    echo "POM is already set up for Spark 2."
-    echo "Cowardly refusing to move to Spark 2..."
+    echo "POM is already set up for Spark 2 (Spark 1/2 artifacts have -spark2 suffix in artifact names)."
+    echo "Cowardly refusing to move to Spark 2 a second time..."
 
     exit 1
 fi