diff options
| author | Milind Changire <mchangir@redhat.com> | 2018-01-26 16:07:59 +0530 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2018-01-30 05:59:09 +0000 |
| commit | 016165c4110b2bd5bba5c64b7a3d09e9bc4928c2 (patch) | |
| tree | fa9da4003456ce71d7c267b73bf243fcc16f62c7 | |
| parent | d25b6065469eb978d40450b5aebcf5711fb50205 (diff) | |
tests: merge stdout and stderr output
Add -m argument to 'prove' command-line.
Fix xxhsum.c debugging output to keep 'prove' happy.
Change-Id: I03485d5f5e43ae4ce454a275ec98bc18384ed00c
Signed-off-by: Milind Changire <mchangir@redhat.com>
| -rw-r--r-- | contrib/xxhash/xxhsum.c | 8 | ||||
| -rwxr-xr-x | run-tests.sh | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/contrib/xxhash/xxhsum.c b/contrib/xxhash/xxhsum.c index 0148e3c4566..6cb54386093 100644 --- a/contrib/xxhash/xxhsum.c +++ b/contrib/xxhash/xxhsum.c @@ -150,9 +150,9 @@ static const algoType g_defaultAlgo = algo_xxh64; /* required within main() & /* ************************************ * Display macros **************************************/ -#define DISPLAY(...) fprintf(stderr, __VA_ARGS__) +#define DISPLAY(...) /*fprintf(stderr, __VA_ARGS__)*/ #define DISPLAYRESULT(...) fprintf(stdout, __VA_ARGS__) -#define DISPLAYLEVEL(l, ...) if (g_displayLevel>=l) DISPLAY(__VA_ARGS__); +#define DISPLAYLEVEL(l, ...) /*if (g_displayLevel>=l) DISPLAY(__VA_ARGS__);*/ static U32 g_displayLevel = 1; @@ -302,7 +302,7 @@ static int BMK_benchFiles(const char** fileNamesTable, int nbFiles) } /* Fill input buffer */ - DISPLAY("\rLoading %s... \n", inFileName); + DISPLAY("\nLoading %s... \n", inFileName); { size_t const readSize = fread(alignedBuffer, 1, benchedSize, inFile); fclose(inFile); if(readSize != benchedSize) { @@ -548,7 +548,7 @@ static int BMK_hash(const char* fileName, &&(fileNameEnd[-1-infoFilenameSize] != '/') &&(fileNameEnd[-1-infoFilenameSize] != '\\') ) infoFilenameSize++; - DISPLAY("\rLoading %s... \r", fileNameEnd - infoFilenameSize); + DISPLAY("\nLoading %s... \n", fileNameEnd - infoFilenameSize); } /* Load file & update hash */ diff --git a/run-tests.sh b/run-tests.sh index dbf4a5e3b3c..017248cbb63 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -268,7 +268,7 @@ function run_tests() total_run_tests=$((total_run_tests+1)) echo "[$(date +%H:%M:%S)] Running tests in file $t" starttime="$(date +%s)" - prove -vfe '/bin/bash' $t + prove -vmfe '/bin/bash' $t TMP_RES=$? ELAPSEDTIMEMAP[$t]=`expr $(date +%s) - $starttime` if [ ${TMP_RES} -ne 0 ] && [ "x${retry}" = "xyes" ] ; then @@ -280,7 +280,7 @@ function run_tests() echo " * we got some spurious failures *" echo " *********************************" echo "" - prove -vfe '/bin/bash' $t + prove -vmfe '/bin/bash' $t TMP_RES=$? fi if [ ${TMP_RES} -ne 0 ] ; then |