Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
frama-c
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Charles Southerland
frama-c
Commits
e724c45e
Commit
e724c45e
authored
4 years ago
by
Andre Maroneze
Browse files
Options
Downloads
Patches
Plain Diff
[tests] conditionally disable tests requiring Python 3.6
parent
83b00eb9
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure.in
+26
-0
26 additions, 0 deletions
configure.in
share/Makefile.config.in
+9
-2
9 additions, 2 deletions
share/Makefile.config.in
with
35 additions
and
2 deletions
configure.in
+
26
−
0
View file @
e724c45e
...
@@ -397,6 +397,31 @@ else
...
@@ -397,6 +397,31 @@ else
HAS_LANDMARKS="no"
HAS_LANDMARKS="no"
fi
fi
# Python 3 (for analysis-scripts)
########
AC_MSG_CHECKING(for python3)
PYTHON3_VERSION=$(python3 --version 2>/dev/null || echo "")
if test -z "$PYTHON3_VERSION" ; then
AC_MSG_RESULT(not found. Some non-regression tests will be disabled.)
HAS_PYTHON36="no"
else
AC_MSG_RESULT(found)
AC_MSG_CHECKING(for python3 >= 3.6)
PYTHON3_VERSION=$(echo "$PYTHON3_VERSION" | cut -d' ' -f2-)
case $PYTHON3_VERSION in
2.*|3.[[0-5]].*)
AC_MSG_RESULT(found $PYTHON3_VERSION (too old); some non-regression tests will be disabled)
HAS_PYTHON36="no"
;;
*)
AC_MSG_RESULT(ok)
HAS_PYTHON36="yes"
;;
esac
fi
############
############
# Platform #
# Platform #
############
############
...
@@ -978,6 +1003,7 @@ AC_SUBST(DEVELOPMENT)
...
@@ -978,6 +1003,7 @@ AC_SUBST(DEVELOPMENT)
AC_SUBST(HAS_APRON)
AC_SUBST(HAS_APRON)
AC_SUBST(HAS_MPFR)
AC_SUBST(HAS_MPFR)
AC_SUBST(HAS_LANDMARKS)
AC_SUBST(HAS_LANDMARKS)
AC_SUBST(HAS_PYTHON36)
AC_SUBST(LABLGTK_VERSION)
AC_SUBST(LABLGTK_VERSION)
AC_SUBST(OCAMLBEST)
AC_SUBST(OCAMLBEST)
AC_SUBST(OCAMLVERSION)
AC_SUBST(OCAMLVERSION)
...
...
This diff is collapsed.
Click to expand it.
share/Makefile.config.in
+
9
−
2
View file @
e724c45e
...
@@ -128,6 +128,9 @@ HAS_MPFR ?=@HAS_MPFR@
...
@@ -128,6 +128,9 @@ HAS_MPFR ?=@HAS_MPFR@
# landmarks
# landmarks
HAS_LANDMARKS
?=
@HAS_LANDMARKS@
HAS_LANDMARKS
?=
@HAS_LANDMARKS@
# python 3.6
HAS_PYTHON36
?=
@HAS_PYTHON36@
##########################
##########################
# Miscellaneous commands #
# Miscellaneous commands #
##########################
##########################
...
@@ -157,8 +160,12 @@ HAVE_BUILTIN_VA_LIST ?=@HAVE_BUILTIN_VA_LIST@
...
@@ -157,8 +160,12 @@ HAVE_BUILTIN_VA_LIST ?=@HAVE_BUILTIN_VA_LIST@
# Non-plugin test directories containing some ML files to compile
# Non-plugin test directories containing some ML files to compile
TEST_DIRS_AS_PLUGIN
:=
\
TEST_DIRS_AS_PLUGIN
:=
\
dynamic dynamic_plugin journal saveload spec misc syntax cil
\
dynamic dynamic_plugin journal saveload spec misc syntax cil
\
pretty_printing builtins libc value fc_script
pretty_printing builtins libc value
TEST_DIRS_AS_PLUGIN
+=
jcdb
ifeq
($(HAS_PYTHON36),yes)
TEST_DIRS_AS_PLUGIN
+=
fc_script jcdb
endif
PLUGIN_TESTS_LIST
+=
$(
TEST_DIRS_AS_PLUGIN
)
PLUGIN_TESTS_LIST
+=
$(
TEST_DIRS_AS_PLUGIN
)
##########################
##########################
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment