Changeset 13971 for branches/dev-5819/jm_tests.in

Timestamp:

Nov 7, 2019 8:39:03 AM (5 weeks ago)

Author:

randersson

Message:

#5819 Reverted all changes from jm_tests.in

File:

• branches/dev-5819/jm_tests.in (modified) (16 diffs)

branches/dev-5819/jm_tests.in

@@ -21 +21 @@
 
 # Memory allocation for the ant process
-ANT_OPTS="-Xmx4g"
+ANT_OPTS="-Xmx2g"
 
 # Default tests - run if no tests are chosen
@@ -172 +172 @@
 
 function optimica_tests() {
-  echo "in optimica_tests()"
   junit_test Optimica
 }
@@ -184 +183 @@
 
 function python_tests() {
-  TEST_DIR="$(pwd)/tests_$(date "+%F_%H-%M-%S")"
-  mkdir ${TEST_DIR}
+  if [ "${KEEP_PYTHON}" == 1 ]; then
+    TEST_DIR="$(pwd)/tests_$(date "+%F_%H-%M-%S")"
+    mkdir ${TEST_DIR}
+  else
+    TEST_DIR=$(mktemp -dq /tmp/jm_tests.XXXXXX)
+  fi 
   print_name Python
   res=0
-  echo "in python_tests OUTPUT=${OUTPUT}"
-  echo "in python_tests  TEST_DIR=${TEST_DIR}"
   case ${OUTPUT} in
     v)
@@ -209 +210 @@
     n)
       if [[ "${NO_BUILD_JMODELICA}" != "1" ]]; then
-        echo "OUTPUT=${OUTPUT}"
-        echo "NO_BUILD_JMODELICA=${NO_BUILD_JMODELICA}"
         echo Building...
       fi
@@ -263 +262 @@
     for TEST in ${TESTS}; do
       echo ""
-      echo "Running ${TEST}"
-      # echo ${TEST} | sed -e 's!^.*jmodelica.!Running !'
+      echo ${TEST} | sed -e 's!^.*jmodelica.!Running !'
       nose_test ${TEST} \
       | log \
@@ -342 +340 @@
   print_name $1
   cd ${BUILD}/java
-  echo "doing ls..."
-  ls -la
   res=0
   case ${OUTPUT} in
@@ -387 +383 @@
 
 function junit_test_n() {
-    echo "in junit_test_n"
     res=0
     ant_test $1 \
@@ -401 +396 @@
 
 function ant_test() {
-  echo "MC_ANT_ARGS=${MC_ANT_ARGS}"
-  echo "OC_ANT_ARGS=${OC_ANT_ARGS}"
-  echo "BUILD=${BUILD}"
-  echo "CLEAN_JUNIT=${CLEAN_JUNIT}"
-    if [[ "$1" == "Modelica" ]]; then
-        ant -f ${MC_ANT_ARGS} -Dtarget=${BUILD} ${CLEAN_JUNIT} test
-    else
-        ant -f ${OC_ANT_ARGS} -Dtarget=${BUILD} ${CLEAN_JUNIT} test
-    fi
-  echo "about to ls"
-  ls -la ${BUILD}
+  if [[ "$1" == "Modelica" ]]; then
+    ant -f ${MC_ANT_ARGS} -Dtarget=${BUILD} ${CLEAN_JUNIT} test
+  else
+    ant -f ${OC_ANT_ARGS} -Dtarget=${BUILD} ${CLEAN_JUNIT} test
+  fi
 }
 
@@ -453 +442 @@
   TESTS64=
   ARG_TYPE=flag
-  echo "DEFAULT_ARGS=${DEFAULT_ARGS}"
   for a in ${DEFAULT_ARGS} "$@"; do
-    echo a=$a
     if [[ "$(echo $a | head -c1)" == "-" ]]; then
       ARG_TYPE=flag
@@ -463 +450 @@
       flag)
         FLAG=1
-        echo FLAG=$FLAG
         ;;
       tag)
@@ -499 +485 @@
     esac
     if [[ ${FLAG} == 1 ]]; then
-      echo "In flag == 1 with a=${a}"
-      a_split=""
-      for ((i=0; i<${#a}; i++)); do a_split="$a_split ${a:$i:1}"; done
-      echo a_split="$a_split"
-      for b in $a_split; do
-        HAVE_READ_ARGS=1
-        echo b=${b}
+      for b in $(echo "" ${a}|sed 's!\(.\)!\1 !g'); do
         case ${b} in
           -)
@@ -618 +598 @@
         esac
       done
-    else
-      HAVE_READ_ARGS=1
     fi
   done
@@ -636 +614 @@
 TIME=$(date +%s)
 
-echo "TIME = ${TIME}"
-echo "before read_args"
-HAVE_READ_ARGS=0
-echo "PATH=${PATH}"
-echo "args $@"
 read_args "$@"
-if [[ $HAVE_READ_ARGS == 0 ]]; then
-echo "Reading args to jm_tests failed, retrying..."
-read_args "$@"
-fi
-echo "after read_args"
-echo "Writing to LOGFILE=${LOGFILE}"
+
 if [[ $ERROR_ON_TEST_FAIL == 1 ]]; then
     if [[ -z $XML_RES_PATH ]]; then
@@ -657 +625 @@
 if [ "${LOG}" == 1 ]; then
   echo "Log of jm_tests $(date):" > "${LOGFILE}"
-  echo "Finished writing log..."
 fi
 
@@ -666 +633 @@
   fi
 done
-
-echo "ANY_ON=${ANY_ON}"
-echo "DEFAULT_TESTS=${DEFAULT_TESTS}"
 if [[ "${ANY_ON}" == 0 ]]; then
   switch_test_flags ${DEFAULT_TESTS}
@@ -679 +643 @@
 
 res=0
-
 for a in ${tests}; do
   if [[ "${test[${!a}]}" == 1 ]]; then
-    echo "Printing going with ${a}_tests"
-  fi
-done
-for a in ${tests}; do
-  if [[ "${test[${!a}]}" == 1 ]]; then
-    echo "going with ${a}_tests"
     ${a}_tests || res=1
   fi