Skip to content

Commit

Permalink
Merge branch 'master' of github.com:eth-cscs/reframe
Browse files Browse the repository at this point in the history
  • Loading branch information
Vasileios Karakasis committed May 29, 2017
2 parents 84cb00e + 17ed997 commit 63c7657
Show file tree
Hide file tree
Showing 17 changed files with 406 additions and 361 deletions.
92 changes: 92 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
*.egg-info/
.installed.cfg
*.egg

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover
.hypothesis/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# IPython Notebook
.ipynb_checkpoints

# pyenv
.python-version

# celery beat schedule file
celerybeat-schedule

# dotenv
.env

# virtualenv
venv/
ENV/

# Spyder project settings
.spyderproject

# Rope project settings
.ropeproject

# TextMATE files
._*
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ Users can create their own test hierarchies, create test factories for generatin

## Documentation

The official documentation is maintaned [here](https://eth-cscs.github.io/reframe).
The official documentation is maintaned [here](https://madra.cscs.ch/scs/reframe/wikis/home).
32 changes: 29 additions & 3 deletions ci-scripts/ci-runner.bash
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,28 @@ MODULEUSE=""

CI_EXITCODE=0

swap_files()
{
if [ $# -lt 2 ]; then
echo "too few arguments to swap_files()" 1>&2
exit 1
fi

tmp="${1}_save"
cp $1 $tmp
cp $2 $1
cp $tmp $2
/bin/rm $tmp
}

usage()
{
cat <<EOF
Usage: $(tput setaf 1)$scriptname$(tput sgr0) $(tput setaf 3)[OPTIONS]$(tput sgr0) $(tput setaf 2)-f <regression-folder>$(tput sgr0)
$(tput setaf 3)OPTIONS:$(tput sgr0)
$(tput setaf 3)-f | --folder$(tput sgr0) $(tput setaf 1)DIR$(tput sgr0) ci folder, e.g. PyRegression-CI
$(tput setaf 3)-f | --folder$(tput sgr0) $(tput setaf 1)DIR$(tput sgr0) ci folder, e.g. reframe-ci
$(tput setaf 3)-i | --invocation$(tput sgr0) $(tput setaf 1)ARGS$(tput sgr0) invocation for modified user checks. Multiple \`-i' options are multiple invocations
$(tput setaf 3)-l | --load-profile$(tput sgr0) $(tput setaf 1)ARGS$(tput sgr0) sources the given file before any execution of commands
$(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
Expand Down Expand Up @@ -129,7 +143,7 @@ if [ "X${MODULEUSE}" != "X" ]; then
module use ${MODULEUSE}
fi

module load PyRegression
module load reframe

echo "=============="
echo "Loaded Modules"
Expand All @@ -138,14 +152,26 @@ module list

cd ${CI_FOLDER}

echo "Running regression on ${CI_FOLDER}"
echo "Running regression on $(hostname) in ${CI_FOLDER}"

# Performing the unittests
echo "=================="
echo "Running unit tests"
echo "=================="
checked_exec ./test_reframe.py -v

if [ $CI_EXITCODE -eq 0 ]; then
# Run unit tests for the public release
swap_files reframe/settings.py reframe/settings.public.py

echo "================================="
echo "Running public release unit tests"
echo "================================="
checked_exec ./test_reframe.py -v

swap_files reframe/settings.public.py reframe/settings.py
fi

# Find modified or added user checks
userchecks=( $(git log --name-status --oneline --no-merges -1 | \
grep -e '^[AM][[:space:]]*checks/.*\.py$' | \
Expand Down
132 changes: 0 additions & 132 deletions examples/apps/vasp/src/cpu/9060-vasp_mc-brisi.sbatch

This file was deleted.

Loading

0 comments on commit 63c7657

Please sign in to comment.