diff options
| author |   Andrea Arteaga <andyspiros@gmail.com> | 2011-08-19 13:45:41 +0200 |
|---|---|---|
| committer | Andrea Arteaga <andyspiros@gmail.com> | 2011-08-19 13:45:41 +0200 |
| commit | 956c17a127d65428d8cece41844c07fa3833f585 (patch) | |
| tree | 2bbcdf3915a5c0046691dd94a8805ffb35ce2e09 /numbench | |
| parent | Added @file feature. Masked FFTW 3D tests. (diff) | |
| download | auto-numerical-bench-956c17a127d65428d8cece41844c07fa3833f585.tar.gz auto-numerical-bench-956c17a127d65428d8cece41844c07fa3833f585.tar.bz2 auto-numerical-bench-956c17a127d65428d8cece41844c07fa3833f585.zip | |
Updated documentation and allow more environment bash files.
Diffstat (limited to 'numbench')
| -rwxr-xr-x | numbench/main.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/numbench/main.py b/numbench/main.py index 58e5e58..bab534f 100755 --- a/numbench/main.py +++ b/numbench/main.py @@ -86,7 +86,9 @@ def tests_from_input(input): # if @file: read bash script and set env elif var[0] == '@': - fileenv = readEnvFile(pjoin(cfg.curdir, var[1:])) + fileenvNew = readEnvFile(pjoin(cfg.curdir, var[1:])) + fileenv = dict( fileenv.items() + fileenvNew.items() ) + del fileenvNew # Otherwise, assume key=value syntax else: |