diff options
| author | chriseth <chris@ethereum.org> | 2018-03-13 20:15:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-13 20:15:45 +0800 |
| commit | 6bab7a4cce26e922029769e7193636cfc2fe3752 (patch) | |
| tree | 73adb2c2b21783e92cad8a1cdb2bf40a7a01d402 /scripts | |
| parent | f2614be95f71a274db3c172661726dd007e90cf7 (diff) | |
| parent | 7091b6c8b5a91a13ff02255cc0bca08266527e4f (diff) | |
| download | dexon-solidity-6bab7a4cce26e922029769e7193636cfc2fe3752.tar.gz dexon-solidity-6bab7a4cce26e922029769e7193636cfc2fe3752.tar.zst dexon-solidity-6bab7a4cce26e922029769e7193636cfc2fe3752.zip | |
Merge pull request #3707 from ethereum/syntaxTestsTestRunner
Infrastructure for extracting syntax tests.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/isolate_tests.py | 7 | ||||
| -rwxr-xr-x | scripts/tests.sh | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/scripts/isolate_tests.py b/scripts/isolate_tests.py index cfaef210..5bf577d3 100755 --- a/scripts/isolate_tests.py +++ b/scripts/isolate_tests.py @@ -86,10 +86,15 @@ if __name__ == '__main__': for root, subdirs, files in os.walk(path): if '_build' in subdirs: subdirs.remove('_build') + if 'compilationTests' in subdirs: + subdirs.remove('compilationTests') for f in files: path = join(root, f) if docs: cases = extract_docs_cases(path) else: - cases = extract_test_cases(path) + if f.endswith(".sol"): + cases = [open(path, "r").read()] + else: + cases = extract_test_cases(path) write_cases(cases) diff --git a/scripts/tests.sh b/scripts/tests.sh index bf4ee3d9..37ffafc2 100755 --- a/scripts/tests.sh +++ b/scripts/tests.sh @@ -116,7 +116,7 @@ do log=--logger=JUNIT,test_suite,$log_directory/noopt_$vm.xml $testargs_no_opt fi fi - "$REPO_ROOT"/build/test/soltest $progress $log -- "$optimize" --evm-version "$vm" --ipcpath /tmp/test/geth.ipc + "$REPO_ROOT"/build/test/soltest $progress $log -- --testpath "$REPO_ROOT"/test "$optimize" --evm-version "$vm" --ipcpath /tmp/test/geth.ipc done done |