File tree Expand file tree Collapse file tree 2 files changed +0
-27
lines changed Expand file tree Collapse file tree 2 files changed +0
-27
lines changed Original file line number Diff line number Diff line change @@ -10,30 +10,8 @@ export PATH=$SOURCE/../../bin:$PATH
1010echo $PATH
1111echo $SOURCE
1212
13- run_test_ECBUILD_2_COMPAT () {
14- local tname=ECBUILD_2_COMPAT__$1
15- local exp_sts=$2
16- shift 2
17-
18- local bdir=$HERE /build_$tname
19- local logf=$HERE /$tname .log
20-
21- mkdir -p $bdir && cd $bdir
22- local sts=0
23- echo " Running test '$tname '"
24- ecbuild -- -DECBUILD_2_COMPAT=ON -Wno-deprecated $* $SOURCE /test_project > $logf 2>&1 || sts=$?
25-
26- if [[ $sts -ne $exp_sts ]] ; then
27- echo " Test '$tname ': expected exit code $exp_sts , got $sts "
28- cat $logf
29- exit 1
30- fi
31- }
32-
3313run_test () {
3414
35- run_test_ECBUILD_2_COMPAT " $@ "
36-
3715 local tname=$1
3816 local exp_sts=$2
3917 shift 2
Original file line number Diff line number Diff line change @@ -18,11 +18,6 @@ ecbuild_add_option(FEATURE TEST_G CONDITION COND_G)
1818ecbuild_add_option(FEATURE TEST_H REQUIRED_PACKAGES "foo 1.2" ) # should pass as available is version 1.2.3
1919ecbuild_add_option(FEATURE TEST_I REQUIRED_PACKAGES "foo VERSION 1.2" ) # should pass as available is version 1.2.3
2020
21- if ( ECBUILD_2_COMPAT ) # bug present with ECBUILD_2_COMPAT=ON, which will prevent a following find_package with more strict version requirement
22- set ( foo_FOUND 0 )
23- set ( FOO_FOUND 0 )
24- endif ()
25-
2621ecbuild_add_option(FEATURE TEST_J REQUIRED_PACKAGES "foo 2.1" ) # should fail as available is version 1.2.3
2722ecbuild_add_option(FEATURE TEST_K REQUIRED_PACKAGES "foo VERSION 2.1" ) # should fail as available is version 1.2.3
2823
You can’t perform that action at this time.
0 commit comments