X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=scripts%2Ftracediff.sh;h=819a25120ebdfceb2a8234ce1addd3923f1b0916;hb=4fdd5632465440b4f584a74bd4c171aa225a16e5;hp=77d844873a6d4cb6f649f1ea7da61be9b2089189;hpb=234d0bcb5e59b7d11697beb241fb1e13270b1807;p=apitrace

diff --git a/scripts/tracediff.sh b/scripts/tracediff.sh
index 77d8448..819a251 100755
--- a/scripts/tracediff.sh
+++ b/scripts/tracediff.sh
@@ -26,15 +26,13 @@
 
 set -e
 
-TRACEDUMP=${TRACEDUMP:-`dirname "$0"`/../tracedump}
+APITRACE=${APITRACE:-apitrace}
 
-$TRACEDUMP
+$APITRACE dump
 
 stripdump () {
-    # http://www.theeggeadventure.com/wikimedia/index.php/Linux_Tips#Use_sed_to_remove_ANSI_colors
-    $TRACEDUMP "$1" \
+    $APITRACE dump --color=never --arg-names=no "$1" \
     | sed \
-        -e 's/\x1b\[[0-9]\{1,2\}\(;[0-9]\{1,2\}\)\{0,2\}m//g' \
         -e 's/\r$//g' \
         -e 's/^[0-9]\+ //' \
         -e 's/hdc = \w\+/hdc/g' \
@@ -52,6 +50,10 @@ mkfifo "$FIFO2"
 stripdump "$1" "$FIFO1" &
 stripdump "$2" "$FIFO2" &
 
-sdiff --width=`tput cols` --speed-large-files "$FIFO1" "$FIFO2" | less -R
+sdiff \
+    --width=`tput cols` \
+    --speed-large-files \
+    "$FIFO1" "$FIFO2" \
+| less -R
 
 rm -rf "$FIFODIR"