diff options
| -rw-r--r-- | automated/linux/piglit/piglit.yaml | 7 | ||||
| -rwxr-xr-x | automated/linux/piglit/piglit_lava_parse.py | 33 |
2 files changed, 26 insertions, 14 deletions
diff --git a/automated/linux/piglit/piglit.yaml b/automated/linux/piglit/piglit.yaml index 9ea7e82..077dfc7 100644 --- a/automated/linux/piglit/piglit.yaml +++ b/automated/linux/piglit/piglit.yaml @@ -33,5 +33,10 @@ run: - export PIGLIT_SOURCE_DIR=${PIGLIT_SOURCE_DIR} - cd ./automated/linux/piglit - piglit run ${OPTIONS} -l verbose ${PIGLIT_SOURCE_DIR}/${SUITE} ./results - - ./piglit_lava_parse.py ./results/tests > ./result.txt + - if [ -f ./results/results.json.bz2 ]; then + - bzip2 -d ./results/results.json.bz2 + - ./piglit_lava_parse.py ./results/results.json > ./result.txt + - else + - ./piglit_lava_parse.py ./results/tests > ./result.txt + - fi - ../../utils/send-to-lava.sh ./result.txt diff --git a/automated/linux/piglit/piglit_lava_parse.py b/automated/linux/piglit/piglit_lava_parse.py index 185ff9c..95b3636 100755 --- a/automated/linux/piglit/piglit_lava_parse.py +++ b/automated/linux/piglit/piglit_lava_parse.py @@ -48,18 +48,25 @@ def natural_keys(text): if __name__ == '__main__': if len(sys.argv) < 2: - print("Usage: %s <result_dir>" % sys.argv[0]) + print("Usage: %s <result_dir|result_file>" % sys.argv[0]) sys.exit(1) - for root, dirs, files in os.walk(sys.argv[1]): - result_types = {} - for name in sorted(files, key=natural_keys): - if name.endswith('.tmp'): - continue - piglit_result = None - full_f = os.path.join(root, name) - with open(full_f, 'r') as f: - piglit_results = json.loads(f.read()) - for test in piglit_results.keys(): - result = map_result_to_lava(piglit_results[test]['result']) - print("%s %s" % (test, result)) + if os.path.isdir(sys.argv[1]): + for root, dirs, files in os.walk(sys.argv[1]): + result_types = {} + for name in sorted(files, key=natural_keys): + if name.endswith('.tmp'): + continue + piglit_result = None + full_f = os.path.join(root, name) + with open(full_f, 'r') as f: + piglit_results = json.loads(f.read()) + for test in piglit_results.keys(): + result = map_result_to_lava(piglit_results[test]['result']) + print("%s %s" % (test, result)) + else: + with open(sys.argv[1], 'r') as f: + piglit_results = json.loads(f.read()) + for test in sorted(piglit_results['tests'].keys()): + result = map_result_to_lava(piglit_results['tests'][test]['result']) + print("%s %s" % (test, result)) |