Skip to content

Commit ebb03c7

Browse files
authored
Remove ECBUILD_2_COMPAT related test ecmwf#99
2 parents f518c27 + a28178f commit ebb03c7

File tree

2 files changed

+0
-27
lines changed

2 files changed

+0
-27
lines changed

‎tests/ecbuild_add_option/build-and-run.sh‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,8 @@ export PATH=$SOURCE/../../bin:$PATH
1010
echo $PATH
1111
echo $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-
3313
run_test() {
3414

35-
run_test_ECBUILD_2_COMPAT "$@"
36-
3715
local tname=$1
3816
local exp_sts=$2
3917
shift 2

‎tests/ecbuild_add_option/test_project/CMakeLists.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ ecbuild_add_option(FEATURE TEST_G CONDITION COND_G)
1818
ecbuild_add_option(FEATURE TEST_H REQUIRED_PACKAGES "foo 1.2" ) # should pass as available is version 1.2.3
1919
ecbuild_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-
2621
ecbuild_add_option(FEATURE TEST_J REQUIRED_PACKAGES "foo 2.1" ) # should fail as available is version 1.2.3
2722
ecbuild_add_option(FEATURE TEST_K REQUIRED_PACKAGES "foo VERSION 2.1" ) # should fail as available is version 1.2.3
2823

0 commit comments

Comments
 (0)