[open-coarrays] 32/80: Don't try to build test

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository open-coarrays.

commit 44cc1e2452807a2bc369f489da9d7f15c31c6c7d
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Sep 14 16:09:07 2016 +0100

    Don't try to build test
---
 debian/patches/disable-ns-test.patch | 46 +++++++++++++++++++++++++++++++++++-
 debian/patches/typos.patch           |  6 ++---
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/debian/patches/disable-ns-test.patch b/debian/patches/disable-ns-test.patch
index 18c7d3f..21ba028 100644
--- a/debian/patches/disable-ns-test.patch
+++ b/debian/patches/disable-ns-test.patch
@@ -1,6 +1,6 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Disable navier-stokes test that fails due to hard-coded fft library
-Last-Updated: 2016-06-02
+Last-Updated: 2016-09-15
 Forwarded: not-needed
 
 Index: open-coarrays-1.6.0/CMakeLists.txt
@@ -22,3 +22,47 @@ Index: open-coarrays-1.6.0/CMakeLists.txt
    endif()
  else()
    add_test(co_sum_extension ${tests_root}/unit/extensions/test-co_sum-extension.sh)
+Index: open-coarrays-1.7.0/src/tests/integration/pde_solvers/navier-stokes/CMakeLists.txt
+===================================================================
+--- open-coarrays-1.7.0.orig/src/tests/integration/pde_solvers/navier-stokes/CMakeLists.txt
++++ open-coarrays-1.7.0/src/tests/integration/pde_solvers/navier-stokes/CMakeLists.txt
+@@ -1,19 +1,21 @@
++## Skipping this, as we need to link -fPIC which breaks
++
+ # checking whether the machine is of type 64-bit before proceeding further
+-if ( ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") AND ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") )
+-  # Default to older SSE-instruction-based FFT library
+-  if (NOT (DEFINED ENV{TRAVIS}))
+-    if (LEGACY_ARCHITECTURE OR (NOT DEFINED(LEGACY_ARCHITECTURE)))
+-      set(fft_library ${CMAKE_CURRENT_SOURCE_DIR}/libfft_sse.a )
+-    else()
+-      message(WARNING "Attempting to use libfft_avx.a, which only works on recent x86 architectures.")
+-      set(fft_library ${CMAKE_CURRENT_SOURCE_DIR}/libfft_avx.a )
+-    endif()
+-    add_executable( coarray_navier_stokes
+-      coarray-shear_coll.F90
+-      ${walltime_o}
+-    )
+-    target_link_libraries(coarray_navier_stokes OpenCoarrays ${fft_library})
+-  endif()
+-else()
+-  # Skip Navier-Stokes build until an appropriate FFT has been found.
+-endif()
++# if ( ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") AND ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") )
++#   # Default to older SSE-instruction-based FFT library
++#   if (NOT (DEFINED ENV{TRAVIS}))
++#     if (LEGACY_ARCHITECTURE OR (NOT DEFINED(LEGACY_ARCHITECTURE)))
++#       set(fft_library ${CMAKE_CURRENT_SOURCE_DIR}/libfft_sse.a )
++#     else()
++#       message(WARNING "Attempting to use libfft_avx.a, which only works on recent x86 architectures.")
++#       set(fft_library ${CMAKE_CURRENT_SOURCE_DIR}/libfft_avx.a )
++#     endif()
++#     add_executable( coarray_navier_stokes
++#       coarray-shear_coll.F90
++#       ${walltime_o}
++#     )
++#     target_link_libraries(coarray_navier_stokes OpenCoarrays ${fft_library})
++#   endif()
++# else()
++#   # Skip Navier-Stokes build until an appropriate FFT has been found.
++# endif()
diff --git a/debian/patches/typos.patch b/debian/patches/typos.patch
index 0f268be..3679eb2 100644
--- a/debian/patches/typos.patch
+++ b/debian/patches/typos.patch
@@ -3,10 +3,10 @@ Description: Case error causes bash failure
 Last-Updated: 2016-06-03
 Forwarded: no
 
-Index: open-coarrays-1.6.0/src/extensions/cafrun-foot
+Index: open-coarrays-1.7.0/src/extensions/cafrun-foot
 ===================================================================
---- open-coarrays-1.6.0.orig/src/extensions/cafrun-foot
-+++ open-coarrays-1.6.0/src/extensions/cafrun-foot
+--- open-coarrays-1.7.0.orig/src/extensions/cafrun-foot
++++ open-coarrays-1.7.0/src/extensions/cafrun-foot
 @@ -1,4 +1,4 @@
 -Usage()
 +usage()

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