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

build: fix reading of "0" values from version.cache

Browse Source 
Fixes https://gitlab.com/nsnam/ns-3-dev/-/issues/712
This commit is contained in:
Gabriel Ferreira
2022-08-08 12:17:13 -03:00
parent 85a7f1fb69
commit ca421d6447
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-support/custom-modules/ns3-versioning.cmake
View File

@@ -180,7 +180,7 @@ function(configure_embedded_version)
# If value is empty, replace with an empty string, assume its the release
# candidate string
if(NOT varvalue)
if((NOT varvalue) AND (NOT varvalue STREQUAL "0"))
set(varvalue "\"\"")
endif()

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

@@ -1412,6 +1412,7 @@ class NS3ConfigureTestCase(NS3BaseTestCase):
# Configuration should now succeed
container.execute("./ns3 clean")
container.execute("./ns3 configure -G Ninja --enable-build-version")
container.execute("./ns3 build core")
self.assertTrue(os.path.exists(os.path.join(ns3_path, "cmake-cache", "build.ninja")))
# And contents of version cache should be unchanged
@@ -1426,6 +1427,7 @@ class NS3ConfigureTestCase(NS3BaseTestCase):
container.execute("apt-get install -y git")
container.execute("./ns3 clean")
container.execute("./ns3 configure -G Ninja --enable-build-version")
container.execute("./ns3 build core")
except Exception:
pass
os.rename(os.path.join(ns3_path, "temp_git"), os.path.join(ns3_path, ".git"))
@@ -1434,6 +1436,7 @@ class NS3ConfigureTestCase(NS3BaseTestCase):
# Fourth case: test with Git and git history. Now the version.cache should be replaced.
container.execute("./ns3 clean")
container.execute("./ns3 configure -G Ninja --enable-build-version")
container.execute("./ns3 build core")
self.assertTrue(os.path.exists(os.path.join(ns3_path, "cmake-cache", "build.ninja")))
with open(version_cache_file, "r") as version:
self.assertNotEqual(version.read(), version_cache_contents)