diff --git a/build-support/test-files/test-src-dependant-on-contrib/CMakeLists.txt b/build-support/test-files/test-src-dependent-on-contrib/CMakeLists.txt similarity index 79% rename from build-support/test-files/test-src-dependant-on-contrib/CMakeLists.txt rename to build-support/test-files/test-src-dependent-on-contrib/CMakeLists.txt index 6da487312..8597bead4 100644 --- a/build-support/test-files/test-src-dependant-on-contrib/CMakeLists.txt +++ b/build-support/test-files/test-src-dependent-on-contrib/CMakeLists.txt @@ -1,5 +1,5 @@ build_lib( - LIBNAME test-src-dependant-on-contrib + LIBNAME test-src-dependent-on-contrib SOURCE_FILES src-source.cc HEADER_FILES src-header.h LIBRARIES_TO_LINK ${libcore} diff --git a/build-support/test-files/test-src-dependant-on-contrib/examples/CMakeLists.txt b/build-support/test-files/test-src-dependent-on-contrib/examples/CMakeLists.txt similarity index 72% rename from build-support/test-files/test-src-dependant-on-contrib/examples/CMakeLists.txt rename to build-support/test-files/test-src-dependent-on-contrib/examples/CMakeLists.txt index 2146b7fac..9e6862dcd 100644 --- a/build-support/test-files/test-src-dependant-on-contrib/examples/CMakeLists.txt +++ b/build-support/test-files/test-src-dependent-on-contrib/examples/CMakeLists.txt @@ -2,5 +2,5 @@ build_lib_example( NAME source-example SOURCE_FILES source-example.cc LIBRARIES_TO_LINK - ${libtest-src-dependant-on-contrib} + ${libtest-src-dependent-on-contrib} ) diff --git a/build-support/test-files/test-src-dependant-on-contrib/examples/source-example.cc b/build-support/test-files/test-src-dependent-on-contrib/examples/source-example.cc similarity index 100% rename from build-support/test-files/test-src-dependant-on-contrib/examples/source-example.cc rename to build-support/test-files/test-src-dependent-on-contrib/examples/source-example.cc diff --git a/build-support/test-files/test-src-dependant-on-contrib/src-header.h b/build-support/test-files/test-src-dependent-on-contrib/src-header.h similarity index 100% rename from build-support/test-files/test-src-dependant-on-contrib/src-header.h rename to build-support/test-files/test-src-dependent-on-contrib/src-header.h diff --git a/build-support/test-files/test-src-dependant-on-contrib/src-source.cc b/build-support/test-files/test-src-dependent-on-contrib/src-source.cc similarity index 100% rename from build-support/test-files/test-src-dependant-on-contrib/src-source.cc rename to build-support/test-files/test-src-dependent-on-contrib/src-source.cc diff --git a/utils/codespell-ignored-lines b/utils/codespell-ignored-lines index d3d198454..8b8d2c600 100644 --- a/utils/codespell-ignored-lines +++ b/utils/codespell-ignored-lines @@ -134,10 +134,6 @@ static ns3::GlobalValue g_rate("VRCrate", ./src/internet/model/global-route-manager-impl.h:555 typedef std::list ListOfSPFVertex_t; //!< container of SPFVertexes -./utils/tests/test-ns3.py - destination_src = os.path.join(ns3_path, "src/test-src-dependant-on-contrib") - shutil.copytree(os.path.join(ns3_path, "build-support/test-files/test-src-dependant-on-contrib"), - ./CHANGES.md: * (dsr) Class `DsrOptionRerrUnsupportHeader` from `dsr-option-header.h` was renamed `DsrOptionRerrUnsupportedHeader`. * (internet) Enumerated value `IPV6_EXT_AUTHENTIFICATION` from `ipv6-header.h` was renamed `IPV6_EXT_AUTHENTICATION`. diff --git a/utils/tests/test-ns3.py b/utils/tests/test-ns3.py index 9029ad6ac..89d6cfd36 100755 --- a/utils/tests/test-ns3.py +++ b/utils/tests/test-ns3.py @@ -2370,7 +2370,7 @@ class NS3BuildBaseTestCase(NS3BaseTestCase): self.skipTest("Missing git") destination_contrib = os.path.join(ns3_path, "contrib/test-contrib-dependency") - destination_src = os.path.join(ns3_path, "src/test-src-dependant-on-contrib") + destination_src = os.path.join(ns3_path, "src/test-src-dependent-on-contrib") # Remove pre-existing directories if os.path.exists(destination_contrib): shutil.rmtree(destination_contrib) @@ -2380,7 +2380,7 @@ class NS3BuildBaseTestCase(NS3BaseTestCase): # Always use a fresh copy shutil.copytree(os.path.join(ns3_path, "build-support/test-files/test-contrib-dependency"), destination_contrib) - shutil.copytree(os.path.join(ns3_path, "build-support/test-files/test-src-dependant-on-contrib"), + shutil.copytree(os.path.join(ns3_path, "build-support/test-files/test-src-dependent-on-contrib"), destination_src) # Then configure