From 7d6f87cb8a60d668b0fc50f1afe723540d37366e Mon Sep 17 00:00:00 2001
From: Soonho Kong <soonhok@cs.cmu.edu>
Date: Wed, 4 Sep 2013 11:00:55 -0700
Subject: [PATCH] Put MemCheck and Submit to "after_script" section to ignore
 possible failures

---
 .travis.osx.yml | 14 ++++++++------
 .travis.yml     | 14 ++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.travis.osx.yml b/.travis.osx.yml
index f8da8988d4..bfd6ba3ff7 100644
--- a/.travis.osx.yml
+++ b/.travis.osx.yml
@@ -23,12 +23,6 @@ script:
 - ctest -D ExperimentalConfigure
 - ctest -D ExperimentalBuild -VV
 - yes "C" | ctest -D ExperimentalTest -VV
-- if [[ $MEMCHECK == TRUE ]]; then
-     ctest -D ExperimentalMemCheck;
-  fi
-- if [[ $PUSH_TO_CDASH == TRUE ]]; then
-    ctest -D ExperimentalSubmit;
-  fi
 - cd ..
 
 after_script:
@@ -39,6 +33,14 @@ after_script:
       cp build/shell/lean ${UPLOAD_DIR}/${BINARY};
       script/dropbox_upload.py ${UPLOAD_DIR} /Public/${UPLOAD_DIR} ${DROPBOX_KEY};
   fi
+- cd build
+- if [[ $MEMCHECK == TRUE ]]; then
+     ctest -D ExperimentalMemCheck -VV;
+  fi
+- if [[ $PUSH_TO_CDASH == TRUE ]]; then
+    ctest -D ExperimentalSubmit;
+  fi
+- cd ..
 
 install:
 - if [[ $CMAKE_CXX_COMPILER == g++ ]]; then
diff --git a/.travis.yml b/.travis.yml
index 0fbbb5b81a..133a27b83f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -94,12 +94,6 @@ script:
   - if [[ $CMAKE_BUILD_TYPE == TESTCOV ]]; then
        ctest -D ExperimentalCoverage;
     fi
-  - if [[ $MEMCHECK == TRUE ]]; then
-       ctest -D ExperimentalMemCheck;
-    fi
-  - if [[ $PUSH_TO_CDASH == TRUE ]]; then
-        ctest -D ExperimentalSubmit;
-    fi
   - cd ..
 after_script:
 - if [[ $TRIGGER_BB == TRUE ]]; then
@@ -129,6 +123,14 @@ after_script:
       mv /tmp/.travis.temp.yml .travis.yml;
       git reset --hard HEAD~;
   fi
+- cd build
+- if [[ $MEMCHECK == TRUE ]]; then
+     ctest -D ExperimentalMemCheck;
+  fi
+- if [[ $PUSH_TO_CDASH == TRUE ]]; then
+      ctest -D ExperimentalSubmit;
+  fi
+- cd ..
 - if [[ $BUILD_DOXYGEN == TRUE ]]; then
       sudo apt-get -qq install doxygen;
       script/doxygen.sh;