Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
OpenFOAM-plus
Commits
847adca6
Commit
847adca6
authored
Oct 05, 2017
by
mattijs
Browse files
BUG: Allrun: run in non-test mode. Handle ./Alltest correctly
parent
e6ac4035
Changes
4
Hide whitespace changes
Inline
Side-by-side
bin/foamRunTutorials
View file @
847adca6
...
...
@@ -51,6 +51,7 @@ do
case
"
$1
"
in
-t
|
-test
)
passArgs
=
"-test"
runTests
=
true
shift
;;
-s
|
-skipFirst
)
...
...
@@ -64,10 +65,14 @@ do
done
# If an argument is supplied do not execute ./Allrun to avoid recursion
if
!
$skipFirst
&&
[
-f
"./Allrun"
]
if
!
$skipFirst
&&
$runTests
&&
[
-f
"./Alltest"
]
then
# Run speciallised Alltest script.
./Alltest
$passArgs
$*
elif
!
$skipFirst
&&
[
-f
"./Allrun"
]
then
# Run specialised Allrun script.
./Allrun
$passArgs
./Allrun
$passArgs
$*
elif
[
-d
system
]
then
# Run normal case.
...
...
@@ -89,7 +94,7 @@ else
# Run all cases which have not already been run
$make
-k
-f
$WM_PROJECT_DIR
/bin/tools/MakefileDirs
\
FOAM_TARGETS
=
"
$FOAM_TARGETS
"
\
FOAM_APP
=
"
$thisScript
"
FOAM_ARGS
=
"
$passArgs
"
FOAM_APP
=
"
$thisScript
"
FOAM_ARGS
=
"
$passArgs
$*
"
fi
#------------------------------------------------------------------------------
tutorials/Allrun
View file @
847adca6
...
...
@@ -124,7 +124,7 @@ logReport()
if
[
-z
"
$optCollectOnly
"
]
then
# Recursively run all tutorials
foamRunTutorials
-test
-skipFirst
foamRunTutorials
-skipFirst
$*
fi
...
...
tutorials/Alltest
View file @
847adca6
...
...
@@ -244,7 +244,7 @@ fi
cp
-f
$FOAM_TUTORIALS
/Allrun
.
./Allrun
./Allrun
-test
sed
-e
:a
-e
'/\\$/N; s/\\\n//; ta'
Allrun
>
temp
APPLICATIONS
=
\
...
...
tutorials/IO/fileHandler/Alltest
0 → 100755
View file @
847adca6
#!/bin/sh
cd
${
0
%/*
}
||
exit
1
# Run from this directory
# Source tutorial run functions
.
$WM_PROJECT_DIR
/bin/tools/RunFunctions
# Reset the controlDict
if
[
-f
system/controlDict.orig
]
then
echo
"
$0
: restoring the controlDict from controlDict.orig"
mv
system/controlDict.orig system/controlDict
fi
./Allrun
#------------------------------------------------------------------------------
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment