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

build: Bump minimum clang version to clang-11

Browse Source 
Required to support <numbers> header first used in 73474d22
This commit is contained in:
Gabriel Ferreira
2024-08-24 21:13:16 +02:00
parent d5772ce048
commit 5c5a14dc56
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -12,7 +12,7 @@ file(STRINGS VERSION NS3_VER)
# minimum compiler versions # minimum compiler versions
set(AppleClang_MinVersion 13.1.6) set(AppleClang_MinVersion 13.1.6)
set(Clang_MinVersion 10.0.0) set(Clang_MinVersion 11.0.0)
set(GNU_MinVersion 10.1.0) set(GNU_MinVersion 10.1.0)
# common options # common options

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

@@ -1937,12 +1937,13 @@ class NS3ConfigureTestCase(NS3BaseTestCase):
run_ns3("clean") run_ns3("clean")
with DockerContainerManager(self, "ubuntu:20.04") as container: with DockerContainerManager(self, "ubuntu:20.04") as container:
container.execute("apt-get update") container.execute("apt-get update")
container.execute("apt-get install -y python3 cmake clang-10") container.execute("apt-get remove -y g++")
container.execute("apt-get install -y python3 cmake g++-10 clang-11")
# Enable Ninja tracing without using the Ninja generator # Enable Ninja tracing without using the Ninja generator
try: try:
container.execute( container.execute(
"./ns3 configure --enable-modules=core --enable-ninja-tracing -- -DCMAKE_CXX_COMPILER=/usr/bin/clang++-10" "./ns3 configure --enable-modules=core --enable-ninja-tracing -- -DCMAKE_CXX_COMPILER=/usr/bin/clang++-11"
) )
except DockerException as e: except DockerException as e:
self.assertIn("Ninjatracing requires the Ninja generator", e.stderr) self.assertIn("Ninjatracing requires the Ninja generator", e.stderr)
@@ -1954,7 +1955,7 @@ class NS3ConfigureTestCase(NS3BaseTestCase):
# Enable Ninjatracing support without git (should fail) # Enable Ninjatracing support without git (should fail)
try: try:
container.execute( container.execute(
"./ns3 configure -G Ninja --enable-modules=core --enable-ninja-tracing -- -DCMAKE_CXX_COMPILER=/usr/bin/clang++-10" "./ns3 configure -G Ninja --enable-modules=core --enable-ninja-tracing -- -DCMAKE_CXX_COMPILER=/usr/bin/clang++-11"
) )
except DockerException as e: except DockerException as e:
self.assertIn("could not find git for clone of NinjaTracing", e.stderr) self.assertIn("could not find git for clone of NinjaTracing", e.stderr)
@@ -1963,7 +1964,7 @@ class NS3ConfigureTestCase(NS3BaseTestCase):
# Enable Ninjatracing support with git (it should succeed) # Enable Ninjatracing support with git (it should succeed)
try: try:
container.execute( container.execute(
"./ns3 configure -G Ninja --enable-modules=core --enable-ninja-tracing -- -DCMAKE_CXX_COMPILER=/usr/bin/clang++-10" "./ns3 configure -G Ninja --enable-modules=core --enable-ninja-tracing -- -DCMAKE_CXX_COMPILER=/usr/bin/clang++-11"
) )
except DockerException as e: except DockerException as e:
self.assertTrue(False, "Failed to configure with Ninjatracing") self.assertTrue(False, "Failed to configure with Ninjatracing")
@@ -1992,7 +1993,7 @@ class NS3ConfigureTestCase(NS3BaseTestCase):
# Enable Clang TimeTrace feature for more detailed traces # Enable Clang TimeTrace feature for more detailed traces
try: try:
container.execute( container.execute(
"./ns3 configure -G Ninja --enable-modules=core --enable-ninja-tracing -- -DCMAKE_CXX_COMPILER=/usr/bin/clang++-10 -DNS3_CLANG_TIMETRACE=ON" "./ns3 configure -G Ninja --enable-modules=core --enable-ninja-tracing -- -DCMAKE_CXX_COMPILER=/usr/bin/clang++-11 -DNS3_CLANG_TIMETRACE=ON"
) )
except DockerException as e: except DockerException as e:
self.assertTrue(False, "Failed to configure Ninjatracing with Clang's TimeTrace") self.assertTrue(False, "Failed to configure Ninjatracing with Clang's TimeTrace")