From d86b3689d9b1127908d0492ec6209a945c9290bd Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Tue, 7 Nov 2023 14:40:40 +0200 Subject: [PATCH] tests: workaround name conflict, causing false positives with msvc on windows, when both tests were executed at the same time (locked executable) --- .../dynamic_library_loader/{use.v => use_shared_library.v} | 0 examples/dynamic_library_loader/use_test.v | 6 +++--- examples/dynamic_library_loading/{use.v => use_dl_module.v} | 0 examples/dynamic_library_loading/use_library_test.v | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename examples/dynamic_library_loader/{use.v => use_shared_library.v} (100%) rename examples/dynamic_library_loading/{use.v => use_dl_module.v} (100%) diff --git a/examples/dynamic_library_loader/use.v b/examples/dynamic_library_loader/use_shared_library.v similarity index 100% rename from examples/dynamic_library_loader/use.v rename to examples/dynamic_library_loader/use_shared_library.v diff --git a/examples/dynamic_library_loader/use_test.v b/examples/dynamic_library_loader/use_test.v index 5d7e6b7dd2f637..31e0cbabff77bf 100644 --- a/examples/dynamic_library_loader/use_test.v +++ b/examples/dynamic_library_loader/use_test.v @@ -31,7 +31,7 @@ fn test_can_compile_main_program() { os.chdir(cfolder) or {} library_file_path := os.join_path(cfolder, dl.get_libname('library')) assert os.is_file(library_file_path) - result := v_compile('run use.v') + result := v_compile('run use_shared_library.v') // dump(result) assert result.output.contains('res: 4') os.rm(library_file_path) or {} @@ -43,7 +43,7 @@ fn test_can_compile_and_use_library_with_skip_unused_home_dir() { os.rm(library_file_path) or {} v_compile('-skip-unused -d no_backtrace -o library -shared modules/library/library.v') assert os.is_file(library_file_path) - result := v_compile('run use.v') + result := v_compile('run use_shared_library.v') assert result.output.contains('res: 4') os.rm(library_file_path) or {} } @@ -55,7 +55,7 @@ fn test_can_compile_and_use_library_with_skip_unused_location1_dir() { os.mkdir('location1') or {} v_compile('-skip-unused -d no_backtrace -o location1/library -shared modules/library/library.v') assert os.is_file(library_file_path) - result := v_compile('run use.v') + result := v_compile('run use_shared_library.v') assert result.output.contains('res: 4') os.rm(library_file_path) or {} } diff --git a/examples/dynamic_library_loading/use.v b/examples/dynamic_library_loading/use_dl_module.v similarity index 100% rename from examples/dynamic_library_loading/use.v rename to examples/dynamic_library_loading/use_dl_module.v diff --git a/examples/dynamic_library_loading/use_library_test.v b/examples/dynamic_library_loading/use_library_test.v index 52b6c68334b132..fba02e26374aed 100644 --- a/examples/dynamic_library_loading/use_library_test.v +++ b/examples/dynamic_library_loading/use_library_test.v @@ -32,7 +32,7 @@ fn test_can_compile_library() { fn test_can_compile_main_program() { os.chdir(cfolder) or {} assert os.is_file(library_file_name) - result := v_compile('run use.v') + result := v_compile('run use_dl_module.v') // dump(result) assert result.output.contains('res: 4') os.rm(library_file_name) or {} @@ -43,7 +43,7 @@ fn test_can_compile_and_use_library_with_skip_unused() { os.rm(library_file_name) or {} v_compile('-skip-unused -d no_backtrace -o library -shared modules/library/library.v') assert os.is_file(library_file_name) - result := v_compile('run use.v') + result := v_compile('run use_dl_module.v') assert result.output.contains('res: 4') os.rm(library_file_name) or {} }