[emos] 01/08: Disable download of bufr tests

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository emos.

commit bd3bd69aa1dd28f0251f293f09194a45b8ae2531
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Oct 28 02:58:34 2015 +0000

    Disable download of bufr tests
---
 debian/changelog                            |  9 +++++--
 debian/patches/disable-test-downloads.patch | 42 +++++++++++++++++++++++++++++
 debian/patches/links-fix.patch              |  5 ----
 debian/patches/series                       |  1 +
 debian/patches/testbuild.patch              |  6 -----
 5 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ec994b6..10b9b3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+emoslib (2:4.1.1-3) experimental; urgency=medium
+
+  * Disable download of bufr tests 
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Tue, 27 Oct 2015 16:06:30 +0000
+
 emoslib (2:4.1.1-2) experimental; urgency=medium
 
   * Change /usr/lib/*/cmake/Emos -> /usr/lib/*/cmake/libemos 
@@ -6,9 +12,8 @@ emoslib (2:4.1.1-2) experimental; urgency=medium
   * Now need libboost-test-dev optional package
   * Re-enable tests.
   * Fixup libemos-dev cmake files for metview to compile
-  * re-enable pkgconfig files which were dropped in cmake-build move.
 
- -- Alastair McKinstry <mckinstry at debian.org>  Wed, 21 Oct 2015 17:51:39 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Sat, 24 Oct 2015 20:58:07 +0100
 
 emoslib (2:4.1.1-1) unstable; urgency=medium
 
diff --git a/debian/patches/disable-test-downloads.patch b/debian/patches/disable-test-downloads.patch
new file mode 100644
index 0000000..b0ded9d
--- /dev/null
+++ b/debian/patches/disable-test-downloads.patch
@@ -0,0 +1,42 @@
+Index: emoslib-4.1.1/tests/CMakeLists.txt
+===================================================================
+--- emoslib-4.1.1.orig/tests/CMakeLists.txt
++++ emoslib-4.1.1/tests/CMakeLists.txt
+@@ -114,9 +114,9 @@ else()
+ endif()
+ 
+ # download bufr test files
+-file(READ "bufr_data_files.txt" bufr_files)
+-string(REGEX REPLACE "\n" ";" bufr_files "${bufr_files}")
+-ecbuild_get_test_multidata( TARGET download_bufrs NOCHECK NAMES ${bufr_files} )
++#file(READ "bufr_data_files.txt" bufr_files)
++#string(REGEX REPLACE "\n" ";" bufr_files "${bufr_files}")
++#ecbuild_get_test_multidata( TARGET download_bufrs NOCHECK NAMES ${bufr_files} )
+ 
+ # add F90 tests
+ if( ENABLE_FORTRAN90 )
+@@ -163,15 +163,15 @@ ecbuild_add_test(
+   ENVIRONMENT BUFR_TABLES="NotFoundTablesPath/" )
+ set_tests_properties( bufr_decode_all_NotFoundTablesPath PROPERTIES WILL_FAIL TRUE )
+ 
+-foreach( bufr_file ${bufr_files} )
+-  ecbuild_add_test(
+-    TARGET       bufr_decode_all_${bufr_file}
+-    COMMAND      ${CMAKE_INSTALL_PREFIX}/bin/bufr_decode_all
+-    CONDITION    TEST_BUFR_TABLES_PATH_EXISTS
+-    ARGS         -i ${bufr_file}
+-    TEST_DEPENDS download_bufrs
+-    ENVIRONMENT  BUFR_TABLES=${TEST_BUFR_TABLES_PATH} )
+-endforeach()
++#foreach( bufr_file ${bufr_files} )
++#  ecbuild_add_test(
++#    TARGET       bufr_decode_all_${bufr_file}
++#    COMMAND      ${CMAKE_INSTALL_PREFIX}/bin/bufr_decode_all
++#    CONDITION    TEST_BUFR_TABLES_PATH_EXISTS
++#    ARGS         -i ${bufr_file}
++#    TEST_DEPENDS download_bufrs
++#    ENVIRONMENT  BUFR_TABLES=${TEST_BUFR_TABLES_PATH} )
++#endforeach()
+ 
+ 
+ #if( ENABLE_INSTALL_TOOLS )
diff --git a/debian/patches/links-fix.patch b/debian/patches/links-fix.patch
index 9e676c0..97037b2 100644
--- a/debian/patches/links-fix.patch
+++ b/debian/patches/links-fix.patch
@@ -1,8 +1,3 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Change ln -s --> ln -sf to make idempotent
-Last-Updated: 2015-10-24
-Forwarded: no
-
 Index: emoslib-4.1.1/bufrtables/links.sh
 ===================================================================
 --- emoslib-4.1.1.orig/bufrtables/links.sh
diff --git a/debian/patches/series b/debian/patches/series
index 7b326f8..8902218 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ build_fixes.patch
 cmake_fixes.patch
 testbuild.patch
 links-fix.patch
+disable-test-downloads.patch
diff --git a/debian/patches/testbuild.patch b/debian/patches/testbuild.patch
index fe30ae3..74d3e63 100644
--- a/debian/patches/testbuild.patch
+++ b/debian/patches/testbuild.patch
@@ -1,9 +1,3 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Change test binary location to install location, where it will be found
- on Debian during build / test / install process
-Last-Updated: 2015-10-25
-Forwarded: not-needed
-
 Index: emoslib-4.1.1/tests/CMakeLists.txt
 ===================================================================
 --- emoslib-4.1.1.orig/tests/CMakeLists.txt

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/emos.git