[Cmake-commits] CMake branch, next, updated. v3.3.1-2689-g52bfa08

[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  52bfa089205632b0a64185c37741786877846f62 (commit)
       via  21d99aa345f0af53987cd745384d28f639044507 (commit)
      from  3f9f0a62a433a3cae1749a93fb95459fbfdb61e6 (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=52bfa089205632b0a64185c37741786877846f62
commit 52bfa089205632b0a64185c37741786877846f62
Merge: 3f9f0a6 21d99aa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 1 10:30:29 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 1 10:30:29 2015 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21d99aa345f0af53987cd745384d28f639044507
commit 21d99aa345f0af53987cd745384d28f639044507
Author:     Raphael Kubo da Costa <rakuco at FreeBSD.org>
AuthorDate: Tue Sep 1 15:33:15 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 1 10:30:09 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.
    
    The same issue also affected Tests/Plugin's check_mod_soname.cmake, so
    fix that one as well -- the only reason the test was not failing is that
    it tested that the regular expression did not match, which was always
    the case with a non-binutils readelf.

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()
diff --git a/Tests/Plugin/check_mod_soname.cmake b/Tests/Plugin/check_mod_soname.cmake
index 21a33b1..eeededa 100644
--- a/Tests/Plugin/check_mod_soname.cmake
+++ b/Tests/Plugin/check_mod_soname.cmake
@@ -1,5 +1,5 @@
 execute_process(COMMAND ${readelf} -d ${mod} OUTPUT_FILE ${mod}.readelf.txt)
-file(STRINGS ${mod}.readelf.txt soname REGEX "\\(SONAME\\)")
+file(STRINGS ${mod}.readelf.txt soname REGEX "SONAME")
 if(soname)
   message(FATAL_ERROR "${mod} has soname but should not:\n  ${soname}")
 else()

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

Summary of changes:


hooks/post-receive
-- 
CMake