Commit 5962c46a authored by Patrick Baudin's avatar Patrick Baudin
Browse files

Merge branch 'fix/tests/export-makefile-vars' into 'master'

[Makefile] export WP cache-related Makefile variables to commands

See merge request frama-c/frama-c!3895
parents 259339c7 277d01d8
......@@ -31,7 +31,7 @@ SAVE=
DUNE_OPT=
DUNE_LOG=./.test-errors.log
CACHEDIR=./.wp-cache
CACHEDIR=$(pwd -P)/.wp-cache
FRAMAC_WP_CACHE_GIT=git@git.frama-c.com:frama-c/wp-cache.git
# --------------------------------------------------------------------------
......@@ -73,7 +73,7 @@ function Usage
echo ""
echo " FRAMAC_WP_QUALIF"
echo " FRAMAC_WP_CACHEDIR"
echo " Location of wp-cache ($FRAMAC_WP_CACHEDIR)"
echo " Absolute path to wp-cache directory ($FRAMAC_WP_CACHEDIR)"
if [ ! -d $FRAMAC_WP_CACHEDIR ]; then
echo " About to clone from $FRAMAC_WP_CACHE_GIT"
fi
......@@ -142,6 +142,11 @@ function SetEnv
[ ! -f "$FRAMAC_WP_CACHEDIR" ] || [ -d "$FRAMAC_WP_CACHEDIR" ] \
|| Error "$FRAMAC_WP_CACHEDIR is not a directory"
case "$FRAMAC_WP_CACHEDIR" in
/*);;
*) Error "Requires an absolute path to $FRAMAC_WP_CACHEDIR";;
esac
}
function CloneCache
......
......@@ -47,6 +47,11 @@ else
FRAMAC_WP_CACHEDIR?=
endif
ifeq ($(PTEST_USE_WP_CACHE),yes)
# we need these variable to be present in the shell environment of the commands
export FRAMAC_WP_CACHEDIR FRAMAC_WP_CACHE
endif
############
# Default values necessary for make -f <this-makefile>
......
......@@ -48,6 +48,8 @@ The `./bin/test.sh` uses, in order of proprity:
- `FRAMAC_WP_CACHEDIR` environement variable,
- local `./.wp-cache` directory.
Of course, these environment variables must be set to an absolute path to prevent from different execution locations of Frama-C.
It is _not_ recommended to use the `FRAMAC_WP_CACHEDIR` variable in your default
shell setup, unless is it a temporary directory (eg. `/tmp/wp-sandbox`) since
_every_ run of `frama-c -wp` might then use it by default. Be carefull if you do so.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment