From b18aea315d2e5c12ff6aa7cbf24d559e0523e778 Mon Sep 17 00:00:00 2001 From: chriseth Date: Wed, 22 Mar 2017 20:19:20 +0100 Subject: Isolate test cases from all tests and store under hash. --- scripts/isolate_tests.py | 24 ++++++++++++------------ test/cmdlineTests.sh | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/isolate_tests.py b/scripts/isolate_tests.py index 9bb52f4c..a1d1c75c 100755 --- a/scripts/isolate_tests.py +++ b/scripts/isolate_tests.py @@ -8,10 +8,12 @@ import sys import re - +import os +import hashlib +from os.path import join def extract_cases(path): - lines = open(path).read().splitlines() + lines = open(path, 'rb').read().splitlines() inside = False delimiter = '' @@ -33,16 +35,14 @@ def extract_cases(path): return tests -def write_cases(tests, start=0): - for i, test in enumerate(tests, start=start): - open('test%d.sol' % i, 'w').write(test) - +def write_cases(tests): + for test in tests: + open('test_%s.sol' % hashlib.sha256(test).hexdigest(), 'wb').write(test) if __name__ == '__main__': - files = sys.argv[1:] + path = sys.argv[1] - i = 0 - for path in files: - cases = extract_cases(path) - write_cases(cases, start=i) - i += len(cases) + for root, dir, files in os.walk(path): + for f in files: + cases = extract_cases(join(root, f)) + write_cases(cases) diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh index e2ee6a5e..99cac346 100755 --- a/test/cmdlineTests.sh +++ b/test/cmdlineTests.sh @@ -73,7 +73,7 @@ TMPDIR=$(mktemp -d) cd "$REPO_ROOT" REPO_ROOT=$(pwd) # make it absolute cd "$TMPDIR" - "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/test/contracts/* "$REPO_ROOT"/test/libsolidity/*EndToEnd* + "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/test/ for f in *.sol do "$REPO_ROOT"/build/test/solfuzzer < "$f" -- cgit v1.2.3