Merge pull request #89 from Libensemble/testing/test_travis

Testing/test travis
Libensemble · Oct 16, 2018 · cfa45f8 · cfa45f8
2 parents d4ac8c8 + 8d162eb
commit cfa45f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/libensemble/tests/regression_tests/test_6-hump_camel_aposmm_LD_MMA.py b/libensemble/tests/regression_tests/test_6-hump_camel_aposmm_LD_MMA.py
@@ -85,7 +85,7 @@
 
 
 # Tell libEnsemble when to stop
-exit_criteria = {'sim_max': 400}
+exit_criteria = {'sim_max': 1000}
 
 
 alloc_specs = {'out':[('allocated',bool)], 'alloc_f':alloc_f}
@@ -135,8 +135,8 @@
         tol = 1e-5
         for m in minima:
             print(np.min(np.sum((H[H['local_min']]['x']-m)**2,1)))
-            assert np.min(np.sum((H[H['local_min']]['x']-m)**2,1)) < tol
+            sys.stdout.flush()
+            if np.min(np.sum((H[H['local_min']]['x']-m)**2,1)) > tol:
+                MPI.COMM_WORLD.Abort(1)
 
         print("\nlibEnsemble with APOSMM using a gradient-based localopt method has identified the " + str(np.shape(minima)[0]) + " minima within a tolerance " + str(tol))
-
-
diff --git a/libensemble/tests/run-tests.sh b/libensemble/tests/run-tests.sh
@@ -407,7 +407,7 @@ if [ "$root_found" = true ]; then
              mpiexec -np $NPROCS $MPIEXEC_FLAGS $PYTHON_RUN -m pytest $TEST_SCRIPT >> $TEST_SCRIPT.$NPROCS'procs'.$REG_TEST_OUTPUT_EXT 2>test.err
              test_code=$?
            else
-             mpiexec -np $NPROCS $MPIEXEC_FLAGS $PYTHON_RUN $COV_LINE_PARALLEL $TEST_SCRIPT >> $TEST_SCRIPT.$NPROCS'procs'.$REG_TEST_OUTPUT_EXT 2>test.err
+             mpiexec -np $NPROCS $MPIEXEC_FLAGS $PYTHON_RUN $COV_LINE_PARALLEL $TEST_SCRIPT #>> $TEST_SCRIPT.$NPROCS'procs'.$REG_TEST_OUTPUT_EXT 2>test.err
              test_code=$?
            fi
            reg_count_runs=$((reg_count_runs+1))