From a46b313c1cc822894b8a714ba5cbb7fcc461f51d Mon Sep 17 00:00:00 2001
From: Soonho Kong <soonhok@cs.cmu.edu>
Date: Sun, 29 Sep 2013 16:29:02 -0700
Subject: [PATCH] chore(travis): use demangle_cpptype.py to print out
 test/valgrind output

[skip ci]
---
 .travis.osx.yml | 6 +++---
 .travis.yml     | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.osx.yml b/.travis.osx.yml
index 241143f2fa..fb20ed26a0 100644
--- a/.travis.osx.yml
+++ b/.travis.osx.yml
@@ -39,7 +39,7 @@ script:
 - sed -i "" "s/^Site:.*/Site:$SITE/" $CONFIG_FILE
 - sed -i "" "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE
 - ctest -D ExperimentalBuild -VV
-- yes "C" | ctest -D ExperimentalTest -VV
+- yes "C" | ctest -D ExperimentalTest -VV | ../script/demangle_cpptype.py;
 - cd ..
 
 after_script:
@@ -60,7 +60,7 @@ after_script:
   fi
 - cd build
 - if [[ $MEMCHECK == TRUE ]]; then
-     yes "C" | ctest -D ExperimentalMemCheck -VV;
+     yes "C" | ctest -D ExperimentalMemCheck -VV | ../script/demangle_cpptype.py;
   fi
 - if [[ $PUSH_TO_CDASH == TRUE ]]; then
     GIT_COMMIT=`git log HEAD~ --oneline -n 1 | cut -d ' ' -f 1`;
@@ -69,7 +69,7 @@ after_script:
     GIT_SUBJECT=${GIT_SUBJECT//,/\,};
     GIT_SUBJECT=$(echo -e $(printf '%q' "$GIT_SUBJECT"));
     find Testing -name "*.xml" -exec sed -i "" "s,Generator=\".*\",Generator=\"${GIT_COMMIT}###${GIT_SUBJECT}\"," {} ";";
-      find Testing \( -name "LastTest_*.log" -o -name "LastDynamicAnalysis_*.log" \) -exec sh -c 'TMP=`mktemp /tmp/ctesttmp_XXXX`; cat {} | c++filt > $TMP; mv -v $TMP {}' ";";
+    find Testing \( -name "LastTest_*.log" -o -name "LastDynamicAnalysis_*.log" \) -exec sh -c 'TMP=`mktemp /tmp/ctesttmp_XXXX`; ../script/demangle_cpptype.py {} > $TMP; mv -v $TMP {}' ";";
     ctest -D ExperimentalSubmit;
   fi
 - cd ..
diff --git a/.travis.yml b/.travis.yml
index 42588da37d..d6e908c50f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -190,7 +190,7 @@ script:
            sed -i "s/^Site:.*/Site:$SITE/" $CONFIG_FILE;
            sed -i "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE;
            ctest -D ExperimentalBuild -VV;
-           yes "C" | ctest -D ExperimentalTest -VV;
+           yes "C" | ctest -D ExperimentalTest -VV | ../script/demangle_cpptype.py;
        fi;
     fi
   - cd ..
@@ -205,7 +205,7 @@ after_script:
      CONFIG_FILE=DartConfiguration.tcl;
      sed -i "s,^MemoryCheckSuppressionFile:\W*$,MemoryCheckSuppressionFile:$MEMCHECK_SUPP," $CONFIG_FILE;
      ulimit -s unlimited;
-     yes "C" | ctest -D ExperimentalMemCheck -VV;
+     yes "C" | ctest -D ExperimentalMemCheck -VV | ../script/demangle_cpptype.py;
   fi
 - if [[ $LEANREPO == BLESSED && $PUSH_TO_CDASH == TRUE ]]; then
       GIT_COMMIT=`git log --oneline -n 1 | cut -d ' ' -f 1`;
@@ -214,6 +214,7 @@ after_script:
       GIT_SUBJECT=${GIT_SUBJECT//,/\,};
       GIT_SUBJECT=$(echo -e $(printf '%q' "$GIT_SUBJECT"));
       find Testing -name "*.xml" -exec sed -i "s,Generator=\".*\",Generator=\"${GIT_COMMIT}###${GIT_SUBJECT}\"," {} ";";
+      find Testing \( -name "LastTest_*.log" -o -name "LastDynamicAnalysis_*.log" \) -exec sh -c 'TMP=`mktemp /tmp/ctesttmp_XXXX`; ../script/demangle_cpptype.py {} > $TMP; mv -v $TMP {}' ";";
       ctest -D ExperimentalSubmit;
   fi
 - cd ..