Skip to content

Test scripts robustness #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ianhinder wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Test scripts robustness #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
943b89c
store-ref-data.sh: Ensure run from testing directory and make more ro…
ianhinder May 6, 2022
bb9705c
run-tests.sh: Add check for correct directory and make more robust
ianhinder May 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 27 additions & 21 deletions testing/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,26 @@

# Setup some safe shell options
set -eu -o pipefail
shopt -s nullglob

if [ ! -d ../examples ]; then
echo "../examples not found. Please run run-tests.sh from the 'testing' directory." >&2
exit 1
fi

# No arguments
if [ $# -eq 0 ]
then

# Set testCases
testCases=`ls -d */`
testCases=$(ls -d -- */)

# One argument
elif [ $# -eq 1 ]
then

# Check if it is a real case
if [ ! -d $1 ]; then
if [ ! -d "$1" ]; then
printf "\nCase name is not a real example case...exiting\n\n"
exit
fi
Expand All @@ -38,41 +44,41 @@ do
case=${d%/}

# Print header
printf "\nRunning $case test!\n\n"
printf "\nRunning %s test!\n\n" "$case"

# Check if there is reference data
if [ ! -d $case/RefData ]; then
printf "\nThere is no reference data for $case case...exiting\n\n"
if [ ! -d "$case"/RefData ]; then
printf "\nThere is no reference data for %s case...exiting\n\n" "$case"
exit
fi

# Clean the directory first
rm -rf $case/LIFE $case/Results $case/$case.diff
rm -rf "$case"/LIFE "$case"/Results "$case/$case.diff"

# Copy params.h from RefData into src folder
cp $case/RefData/params.h ../inc/params.h
cp "$case"/RefData/params.h ../inc/params.h

# Build LIFE
(cd .. && make clean && make -j 8)

# Copy case to directory
cp ../LIFE $case/.
cp ../LIFE "$case/."

# Check if there a geometry.config file
if [ -d $case/RefData/input ]; then
cp -r $case/RefData/input $case/.
if [ -d "$case"/RefData/input ]; then
cp -r "$case"/RefData/input "$case"/.
fi

# Run the case
(cd $case && ./LIFE)
(cd "$case" && ./LIFE)

# If TurekHron case then run again to test restart feature
if [ $case == "TurekHron" ]; then
(cd $case && ./LIFE)
if [ "$case" == "TurekHron" ]; then
(cd "$case" && ./LIFE)
fi

# Print finish
printf "Finished running $case test!\n\n"
printf "Finished running %s test!\n\n" "$case"
done

# Print header
Expand All @@ -94,24 +100,24 @@ do
case=${d%/}

# Check if results exist
if [ -d $case/Results ]; then
if [ -d "$case"/Results ]; then

# Run diff and output to file
if diff -r $case/Results $case/RefData/Results --exclude=Log.out &> $case/$case.diff; then
printf "${green}PASS${normal} -> $case\n\n"
if diff -r "$case"/Results "$case"/RefData/Results --exclude=Log.out &> "$case/$case.diff"; then
printf "%s\n\n" "${green}PASS${normal} -> $case"
else
printf "${red}FAIL${normal} -> $case\n\n"
printf "%s\n\n" "${red}FAIL${normal} -> $case"
nFails=$((nFails+1))
fi
else
printf "${red}MISSING${normal} -> $case\n\n"
printf "%s\n\n" "${red}MISSING${normal} -> $case"
nFails=$((nFails+1))
fi
done

# Check if fails is more than zero times
if [ $nFails -eq 0 ]; then
printf "\n${green}PASSED ALL TESTS!${normal}\n\n"
printf "\n%s\n\n" "${green}PASSED ALL TESTS!${normal}"
else
printf "\n${red}FAILED SOME TESTS!${normal}\n\n"
printf "\n%s\n\n" "${red}FAILED SOME TESTS!${normal}"
fi
32 changes: 19 additions & 13 deletions testing/store-ref-data.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

# Setup some safe shell options
set -eu -o pipefail
shopt -s nullglob

if [ ! -d ../examples ]; then
echo "../examples not found. Please run store-ref-data.sh from the 'testing' directory." >&2
exit 1
fi

# Find all example cases
for d in ../examples/*/
Expand All @@ -14,14 +20,14 @@ do
caseName=${casePath##*/}

# Print header
printf "\nStoring new $caseName RefData!\n\n"
printf "\nStoring new %s RefData!\n\n" "$caseName"

# Clean/create the case directory
rm -rf $caseName
mkdir $caseName
rm -rf "$caseName"
mkdir "$caseName"

# Copy params.h from examples into src folder
cp $casePath/params.h ../inc/params.h
cp "$casePath"/params.h ../inc/params.h

# Modifiy the write out frequencies for testing
sed -i "/const int nSteps/c\const int nSteps = 500;" ../inc/params.h
Expand All @@ -33,25 +39,25 @@ do
(cd .. && make clean && make -j 8)

# Create ref directory
mkdir $caseName/RefData
mkdir "$caseName"/RefData

# Copy case to RefData
cp ../LIFE $caseName/RefData/.
cp ../inc/params.h $caseName/RefData/.
cp ../LIFE "$caseName"/RefData/.
cp ../inc/params.h "$caseName"/RefData/.

# Check if there a geometry.config file
if [ -d $casePath/input ]; then
cp -r $casePath/input $caseName/RefData/.
if [ -d "$casePath"/input ]; then
cp -r "$casePath"/input "$caseName"/RefData/.
fi

# Run the case
(cd $caseName/RefData && ./LIFE)
(cd "$caseName"/RefData && ./LIFE)

# If TurekHron case then run again to test restart feature
if [ $caseName == "TurekHron" ]; then
(cd $caseName/RefData && ./LIFE)
if [ "$caseName" == "TurekHron" ]; then
(cd "$caseName"/RefData && ./LIFE)
fi

# Print finish
printf "Finished storing new $caseName RefData!\n\n"
printf "Finished storing new %s RefData!\n\n" "$caseName"
done