diff --git a/.gitignore b/.gitignore index e96f874..7404829 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,7 @@ configure config.* # script output -perf.out +perf.* # should be added using autoreconf -i INSTALL diff --git a/Makefile.am b/Makefile.am index fadc540..d0b5796 100644 --- a/Makefile.am +++ b/Makefile.am @@ -112,9 +112,10 @@ test: check check: $(src_tests) test-suite # performance tests -perf: +perf: perf.log +perf.%: FORCE if HAS_NODE - @$(path_test)/perf/runner @PERF_TESTS@ + @$(path_test)/perf/runner @PERF_TESTS@ > "$@" else @echo "Node.js must be installed in order to run performance tests" @exit 1 diff --git a/test/perf/runner.in b/test/perf/runner.in index 1fe846f..ce046e2 100755 --- a/test/perf/runner.in +++ b/test/perf/runner.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Copyright (C) 2014 Mike Gerwitz # @@ -21,16 +21,10 @@ # $ column -ts\| perf.out # # -rawout=perf.out ->"$rawout" - for f in "$@"; do @NODE@ "$f" || exit $? done \ - | tee -a "$rawout" \ - | awk -F\| ' + | tee >( awk -F\| ' # format for display as the tests are running { printf "%s (x%s = %ss each): %s\n", $4, $2, $3, $1 } - ' - -echo "Raw data written to $rawout" >&2 + ' >&2 )