From 85fcf95f36a30522b728de3ff19e37b2245656de Mon Sep 17 00:00:00 2001 From: Gabriel Ferreira Date: Sat, 8 Apr 2023 15:19:31 -0300 Subject: [PATCH] build: (fixes #881) fix scratch targets for file names containing dots --- scratch/CMakeLists.txt | 2 +- utils/tests/test-ns3.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scratch/CMakeLists.txt b/scratch/CMakeLists.txt index 7d05f6022..938497414 100644 --- a/scratch/CMakeLists.txt +++ b/scratch/CMakeLists.txt @@ -30,7 +30,7 @@ function(create_scratch source_files) string(REPLACE "/" "_" scratch_dirname "${scratch_dirname}") # Get source name - get_filename_component(scratch_name ${scratch_src} NAME_WE) + get_filename_component(scratch_name ${scratch_src} NAME_WLE) set(target_prefix scratch_) if(scratch_dirname) diff --git a/utils/tests/test-ns3.py b/utils/tests/test-ns3.py index 43103a44f..7c62d8462 100755 --- a/utils/tests/test-ns3.py +++ b/utils/tests/test-ns3.py @@ -1210,7 +1210,8 @@ class NS3ConfigureTestCase(NS3BaseTestCase): test_files = ["scratch/main.cc", "scratch/empty.cc", "scratch/subdir1/main.cc", - "scratch/subdir2/main.cc"] + "scratch/subdir2/main.cc", + "scratch/main.test.dots.in.name.cc"] backup_files = ["scratch/.main.cc"] # hidden files should be ignored # Create test scratch files @@ -1267,7 +1268,7 @@ class NS3ConfigureTestCase(NS3BaseTestCase): )[0] os.remove(os.path.join(executable_absolute_path, executable_name)) - if path not in ["scratch/main.cc", "scratch/empty.cc"]: + if not os.listdir(os.path.dirname(path)): os.rmdir(os.path.dirname(source_absolute_path)) return_code, stdout, stderr = run_ns3("configure -G \"{generator}\"")