diff --git a/debian/changelog b/debian/changelog index 5cad0ddf7..ae0e4de18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ cmake (3.10.2-1) UNRELEASED; urgency=medium * New upstream release. + * Disable CTestTestUpload in autopkgtest. -- Felix Geyer Fri, 26 Jan 2018 17:07:25 +0100 diff --git a/debian/tests/testsuite b/debian/tests/testsuite index 0c2b49846..12bbb9a73 100755 --- a/debian/tests/testsuite +++ b/debian/tests/testsuite @@ -8,4 +8,4 @@ cd "$ADTTMP" cmake -DCMake_TEST_EXTERNAL_CMAKE=/usr/bin "$SRCDIR" make VERBOSE=1 -CTEST_OUTPUT_ON_FAILURE=1 make test ARGS="-E CTestTestUpload -E BootstrapTest" +CTEST_OUTPUT_ON_FAILURE=1 ctest -E '(CTestTestUpload|BootstrapTest)' diff --git a/debian/tests/testsuite-ninja b/debian/tests/testsuite-ninja index 5b9181db4..ebdaeeef8 100755 --- a/debian/tests/testsuite-ninja +++ b/debian/tests/testsuite-ninja @@ -8,4 +8,4 @@ cd "$ADTTMP" cmake -DCMake_TEST_EXTERNAL_CMAKE=/usr/bin -GNinja "$SRCDIR" ninja -v -CTEST_OUTPUT_ON_FAILURE=1 ctest -E CTestTestUpload -E BootstrapTest +CTEST_OUTPUT_ON_FAILURE=1 ctest -E '(CTestTestUpload|BootstrapTest)'