F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: search for "lib" prefix before trying to remove it

Browse Source 
Fixes https://gitlab.com/nsnam/ns-3-dev/-/issues/601
This commit is contained in:
Gabriel Ferreira
2022-03-18 14:04:00 -03:00
parent 3ee4eb41cb
commit e5c6d63c5c
2 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
build-support/macros-and-definitions.cmake
View File

@@ -1300,15 +1300,26 @@ function(copy_headers_before_building_lib libname outputdir headers visibility)
endfunction(copy_headers_before_building_lib)
function(remove_lib_prefix prefixed_library library)
# Check if we still have something remaining after removing the "lib" prefix
string(LENGTH ${prefixed_library} len)
if(${len} LESS 4)
message(FATAL_ERROR "Invalid library name: ${prefixed_library}")
# Check if there is a lib prefix
string(FIND "${prefixed_library}" "lib" lib_pos)
# If there is a lib prefix, try to remove it
if(${lib_pos} EQUAL 0)
# Check if we still have something remaining
# after removing the "lib" prefix
string(LENGTH ${prefixed_library} len)
if(${len} LESS 4)
message(FATAL_ERROR "Invalid library name: ${prefixed_library}")
endif()
# Remove lib prefix from module name (e.g. libcore -> core)
string(SUBSTRING "${prefixed_library}" 3 -1 unprefixed_library)
else()
set(unprefixed_library ${prefixed_library})
endif()
# Remove lib prefix from module name (e.g. libcore -> core)
string(SUBSTRING "${prefixed_library}" 3 -1 lib)
set(${library} ${lib} PARENT_SCOPE)
# Save the unprefixed library name to the parent scope
set(${library} ${unprefixed_library} PARENT_SCOPE)
endfunction()
function(check_for_missing_libraries output_variable_name libraries)

22
utils/tests/test-ns3.py
View File

@@ -939,7 +939,7 @@ class NS3ConfigureTestCase(NS3BaseTestCase):
# Test if configuration succeeds and building the module library fails
with open("contrib/borked/examples/CMakeLists.txt", "w") as f:
f.write("")
for invalid_or_non_existant_library in ["", "fee", "fi", "fogh", "calibre"]:
for invalid_or_non_existant_library in ["", "gsd", "lib", "libfi", "calibre"]:
with open("contrib/borked/CMakeLists.txt", "w") as f:
f.write("""
build_lib(
@@ -950,9 +950,9 @@ class NS3ConfigureTestCase(NS3BaseTestCase):
""" % invalid_or_non_existant_library)
return_code, stdout, stderr = run_ns3("configure -G \"Unix Makefiles\" --enable-examples")
if invalid_or_non_existant_library in ["", "fogh", "calibre"]:
if invalid_or_non_existant_library in ["", "gsd", "libfi", "calibre"]:
self.assertEqual(return_code, 0)
elif invalid_or_non_existant_library in ["fee", "fi"]:
elif invalid_or_non_existant_library in ["lib"]:
self.assertEqual(return_code, 1)
self.assertIn("Invalid library name: %s" % invalid_or_non_existant_library, stderr)
else:
@@ -961,10 +961,10 @@ class NS3ConfigureTestCase(NS3BaseTestCase):
return_code, stdout, stderr = run_ns3("build borked")
if invalid_or_non_existant_library in [""]:
self.assertEqual(return_code, 0)
elif invalid_or_non_existant_library in ["fee", "fi"]:
elif invalid_or_non_existant_library in ["lib"]:
self.assertEqual(return_code, 2) # should fail due to invalid library name
self.assertIn("Invalid library name: %s" % invalid_or_non_existant_library, stderr)
elif invalid_or_non_existant_library in ["fogh", "calibre"]:
elif invalid_or_non_existant_library in ["gsd", "libfi", "calibre"]:
self.assertEqual(return_code, 2) # should fail due to missing library
self.assertIn("cannot find -l%s" % invalid_or_non_existant_library, stderr)
else:
@@ -982,7 +982,7 @@ class NS3ConfigureTestCase(NS3BaseTestCase):
LIBRARIES_TO_LINK ${libcore}
)
""")
for invalid_or_non_existant_library in ["", "fee", "fi", "fogh", "calibre"]:
for invalid_or_non_existant_library in ["", "gsd", "lib", "libfi", "calibre"]:
with open("contrib/borked/examples/CMakeLists.txt", "w") as f:
f.write("""
build_lib_example(
@@ -993,9 +993,9 @@ class NS3ConfigureTestCase(NS3BaseTestCase):
""" % invalid_or_non_existant_library)
return_code, stdout, stderr = run_ns3("configure -G \"Unix Makefiles\"")
if invalid_or_non_existant_library in ["", "fogh", "calibre"]:
if invalid_or_non_existant_library in ["", "gsd", "libfi", "calibre"]:
self.assertEqual(return_code, 0) # should be able to configure
elif invalid_or_non_existant_library in ["fee", "fi"]:
elif invalid_or_non_existant_library in ["lib"]:
self.assertEqual(return_code, 1) # should fail to even configure
self.assertIn("Invalid library name: %s" % invalid_or_non_existant_library, stderr)
else:
@@ -1004,10 +1004,10 @@ class NS3ConfigureTestCase(NS3BaseTestCase):
return_code, stdout, stderr = run_ns3("build borked-example")
if invalid_or_non_existant_library in [""]:
self.assertEqual(return_code, 0) # should be able to build
elif invalid_or_non_existant_library in ["fee", "fi"]:
elif invalid_or_non_existant_library in ["libf"]:
self.assertEqual(return_code, 2) # should fail due to missing configuration
self.assertIn("Invalid library name: %s" % invalid_or_non_existant_library, stderr)
elif invalid_or_non_existant_library in ["fogh", "calibre"]:
elif invalid_or_non_existant_library in ["gsd", "libfi", "calibre"]:
self.assertEqual(return_code, 1) # should fail to find target
self.assertIn("Target to build does not exist: borked-example", stdout)
else:
@@ -1015,7 +1015,7 @@ class NS3ConfigureTestCase(NS3BaseTestCase):
shutil.rmtree("contrib/borked", ignore_errors=True)
def test_15_LibrariesContainingLib(self):
def test_16_LibrariesContainingLib(self):
"""!
Test if CMake can properly handle modules containing "lib",
which is used internally as a prefix for module libraries