Skip to content

Commit 63c7657

Browse files
author
Vasileios Karakasis
committed
Merge branch 'master' of github.com:eth-cscs/reframe
2 parents 84cb00e + 17ed997 commit 63c7657

File tree

17 files changed

+406
-361
lines changed

17 files changed

+406
-361
lines changed

.gitignore

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
# Byte-compiled / optimized / DLL files
2+
__pycache__/
3+
*.py[cod]
4+
*$py.class
5+
6+
# C extensions
7+
*.so
8+
9+
# Distribution / packaging
10+
.Python
11+
env/
12+
build/
13+
develop-eggs/
14+
dist/
15+
downloads/
16+
eggs/
17+
.eggs/
18+
lib/
19+
lib64/
20+
parts/
21+
sdist/
22+
var/
23+
*.egg-info/
24+
.installed.cfg
25+
*.egg
26+
27+
# PyInstaller
28+
# Usually these files are written by a python script from a template
29+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
30+
*.manifest
31+
*.spec
32+
33+
# Installer logs
34+
pip-log.txt
35+
pip-delete-this-directory.txt
36+
37+
# Unit test / coverage reports
38+
htmlcov/
39+
.tox/
40+
.coverage
41+
.coverage.*
42+
.cache
43+
nosetests.xml
44+
coverage.xml
45+
*,cover
46+
.hypothesis/
47+
48+
# Translations
49+
*.mo
50+
*.pot
51+
52+
# Django stuff:
53+
*.log
54+
local_settings.py
55+
56+
# Flask stuff:
57+
instance/
58+
.webassets-cache
59+
60+
# Scrapy stuff:
61+
.scrapy
62+
63+
# Sphinx documentation
64+
docs/_build/
65+
66+
# PyBuilder
67+
target/
68+
69+
# IPython Notebook
70+
.ipynb_checkpoints
71+
72+
# pyenv
73+
.python-version
74+
75+
# celery beat schedule file
76+
celerybeat-schedule
77+
78+
# dotenv
79+
.env
80+
81+
# virtualenv
82+
venv/
83+
ENV/
84+
85+
# Spyder project settings
86+
.spyderproject
87+
88+
# Rope project settings
89+
.ropeproject
90+
91+
# TextMATE files
92+
._*

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ Users can create their own test hierarchies, create test factories for generatin
1414

1515
## Documentation
1616

17-
The official documentation is maintaned [here](https://eth-cscs.github.io/reframe).
17+
The official documentation is maintaned [here](https://madra.cscs.ch/scs/reframe/wikis/home).

ci-scripts/ci-runner.bash

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,28 @@ MODULEUSE=""
1919

2020
CI_EXITCODE=0
2121

22+
swap_files()
23+
{
24+
if [ $# -lt 2 ]; then
25+
echo "too few arguments to swap_files()" 1>&2
26+
exit 1
27+
fi
28+
29+
tmp="${1}_save"
30+
cp $1 $tmp
31+
cp $2 $1
32+
cp $tmp $2
33+
/bin/rm $tmp
34+
}
35+
2236
usage()
2337
{
2438
cat <<EOF
2539
Usage: $(tput setaf 1)$scriptname$(tput sgr0) $(tput setaf 3)[OPTIONS]$(tput sgr0) $(tput setaf 2)-f <regression-folder>$(tput sgr0)
2640
2741
$(tput setaf 3)OPTIONS:$(tput sgr0)
2842
29-
$(tput setaf 3)-f | --folder$(tput sgr0) $(tput setaf 1)DIR$(tput sgr0) ci folder, e.g. PyRegression-CI
43+
$(tput setaf 3)-f | --folder$(tput sgr0) $(tput setaf 1)DIR$(tput sgr0) ci folder, e.g. reframe-ci
3044
$(tput setaf 3)-i | --invocation$(tput sgr0) $(tput setaf 1)ARGS$(tput sgr0) invocation for modified user checks. Multiple \`-i' options are multiple invocations
3145
$(tput setaf 3)-l | --load-profile$(tput sgr0) $(tput setaf 1)ARGS$(tput sgr0) sources the given file before any execution of commands
3246
$(tput setaf 3)-m | --module-use$(tput sgr0) $(tput setaf 1)ARGS$(tput sgr0) executes module use of the give folder before loading the regression
@@ -129,7 +143,7 @@ if [ "X${MODULEUSE}" != "X" ]; then
129143
module use ${MODULEUSE}
130144
fi
131145

132-
module load PyRegression
146+
module load reframe
133147

134148
echo "=============="
135149
echo "Loaded Modules"
@@ -138,14 +152,26 @@ module list
138152

139153
cd ${CI_FOLDER}
140154

141-
echo "Running regression on ${CI_FOLDER}"
155+
echo "Running regression on $(hostname) in ${CI_FOLDER}"
142156

143157
# Performing the unittests
144158
echo "=================="
145159
echo "Running unit tests"
146160
echo "=================="
147161
checked_exec ./test_reframe.py -v
148162

163+
if [ $CI_EXITCODE -eq 0 ]; then
164+
# Run unit tests for the public release
165+
swap_files reframe/settings.py reframe/settings.public.py
166+
167+
echo "================================="
168+
echo "Running public release unit tests"
169+
echo "================================="
170+
checked_exec ./test_reframe.py -v
171+
172+
swap_files reframe/settings.public.py reframe/settings.py
173+
fi
174+
149175
# Find modified or added user checks
150176
userchecks=( $(git log --name-status --oneline --no-merges -1 | \
151177
grep -e '^[AM][[:space:]]*checks/.*\.py$' | \

examples/apps/vasp/src/cpu/9060-vasp_mc-brisi.sbatch

Lines changed: 0 additions & 132 deletions
This file was deleted.

0 commit comments

Comments
 (0)