[Cmake-commits] CMake branch, next, updated. v3.3.1-2672-g13bfc90

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  13bfc90b30f10c06eabacd22332a33c348057863 (commit)
       via  54ec4cc692fbc7ff41aef5dd3b11dec0891ff3ac (commit)
      from  b53baca15b6531a1f4c68f8bdbd1bdf10bc1ec94 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13bfc90b30f10c06eabacd22332a33c348057863
commit 13bfc90b30f10c06eabacd22332a33c348057863
Merge: b53baca 54ec4cc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 1 09:09:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 1 09:09:20 2015 -0400

    Merge topic 'modules-no-soname' into next
    
    54ec4cc6 Tests: Use a less strict regular expression to look for "SONAME"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54ec4cc692fbc7ff41aef5dd3b11dec0891ff3ac
commit 54ec4cc692fbc7ff41aef5dd3b11dec0891ff3ac
Author:     Raphael Kubo da Costa <rakuco at FreeBSD.org>
AuthorDate: Tue Sep 1 00:25:37 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 1 08:48:01 2015 -0400

    Tests: Use a less strict regular expression to look for "SONAME"
    
    Commit 899458ab (Tests: Cover NO_SONAME property for SHARED libraries,
    2015-08-20) introduced a few new ExportImport tests, and the
    check_lib_{no}soname.cmake scripts that parse readelf(1)'s output.
    
    Make the regular expression matching the SONAME line output by readelf
    less strict, as the output format varies across implementations: GNU
    binutils' readelf is the only one to write each ELF header within
    parentheses (which the previous regular expression expected).  The new
    tests were thus failing when either Fedora's elfutils (eu-readelf) or
    elftoolchain's readelf (present on recent FreeBSD versions) were being
    used, as they both list the headers without parentheses.

diff --git a/Tests/ExportImport/Import/A/check_lib_nosoname.cmake b/Tests/ExportImport/Import/A/check_lib_nosoname.cmake
index 6261ff4..613391e 100644
--- a/Tests/ExportImport/Import/A/check_lib_nosoname.cmake
+++ b/Tests/ExportImport/Import/A/check_lib_nosoname.cmake
@@ -1,5 +1,5 @@
 execute_process(COMMAND ${readelf} -d ${lib} OUTPUT_FILE ${lib}.readelf.txt)
-file(STRINGS ${lib}.readelf.txt soname REGEX "\\(SONAME\\)")
+file(STRINGS ${lib}.readelf.txt soname REGEX "SONAME")
 if(soname)
   message(FATAL_ERROR "${lib} has soname but should not:\n  ${soname}")
 else()
diff --git a/Tests/ExportImport/Import/A/check_lib_soname.cmake b/Tests/ExportImport/Import/A/check_lib_soname.cmake
index 7794e80..a3c4b54 100644
--- a/Tests/ExportImport/Import/A/check_lib_soname.cmake
+++ b/Tests/ExportImport/Import/A/check_lib_soname.cmake
@@ -1,5 +1,5 @@
 execute_process(COMMAND ${readelf} -d ${lib} OUTPUT_FILE ${lib}.readelf.txt)
-file(STRINGS ${lib}.readelf.txt soname REGEX "\\(SONAME\\)")
+file(STRINGS ${lib}.readelf.txt soname REGEX "SONAME")
 if(soname)
   message(STATUS "${lib} has soname as expected:\n  ${soname}")
 else()

-----------------------------------------------------------------------

Summary of changes:
 Tests/ExportImport/Import/A/check_lib_nosoname.cmake |    2 +-
 Tests/ExportImport/Import/A/check_lib_soname.cmake   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake