From ab3fc7895a4bf4d94fadff5014f5cdb41af8cc9a Mon Sep 17 00:00:00 2001 From: gym603 Date: Thu, 8 Feb 2024 00:26:10 +0800 Subject: [PATCH] tests: make coutput_test.v skip '*_msvc_windows.vv' when used with gcc (#20748) --- vlib/v/gen/c/coutput_test.v | 6 ++++++ ...ws.c.must_have => aligned_attr_msvc_windows.c.must_have} | 0 ...igned_attr_windows.out => aligned_attr_msvc_windows.out} | 0 ...aligned_attr_windows.vv => aligned_attr_msvc_windows.vv} | 0 4 files changed, 6 insertions(+) rename vlib/v/gen/c/testdata/{aligned_attr_windows.c.must_have => aligned_attr_msvc_windows.c.must_have} (100%) mode change 100755 => 100644 rename vlib/v/gen/c/testdata/{aligned_attr_windows.out => aligned_attr_msvc_windows.out} (100%) mode change 100755 => 100644 rename vlib/v/gen/c/testdata/{aligned_attr_windows.vv => aligned_attr_msvc_windows.vv} (100%) mode change 100755 => 100644 diff --git a/vlib/v/gen/c/coutput_test.v b/vlib/v/gen/c/coutput_test.v index ec001c6cc..bbab83f7d 100644 --- a/vlib/v/gen/c/coutput_test.v +++ b/vlib/v/gen/c/coutput_test.v @@ -249,6 +249,12 @@ fn should_skip(relpath string) bool { eprintln('> skipping ${relpath} on windows') return true } + $if gcc { + if relpath.contains('_msvc_windows.vv') { + eprintln('> skipping ${relpath} on gcc') + return true + } + } } else { if relpath.contains('_windows.vv') { eprintln('> skipping ${relpath} on !windows') diff --git a/vlib/v/gen/c/testdata/aligned_attr_windows.c.must_have b/vlib/v/gen/c/testdata/aligned_attr_msvc_windows.c.must_have old mode 100755 new mode 100644 similarity index 100% rename from vlib/v/gen/c/testdata/aligned_attr_windows.c.must_have rename to vlib/v/gen/c/testdata/aligned_attr_msvc_windows.c.must_have diff --git a/vlib/v/gen/c/testdata/aligned_attr_windows.out b/vlib/v/gen/c/testdata/aligned_attr_msvc_windows.out old mode 100755 new mode 100644 similarity index 100% rename from vlib/v/gen/c/testdata/aligned_attr_windows.out rename to vlib/v/gen/c/testdata/aligned_attr_msvc_windows.out diff --git a/vlib/v/gen/c/testdata/aligned_attr_windows.vv b/vlib/v/gen/c/testdata/aligned_attr_msvc_windows.vv old mode 100755 new mode 100644 similarity index 100% rename from vlib/v/gen/c/testdata/aligned_attr_windows.vv rename to vlib/v/gen/c/testdata/aligned_attr_msvc_windows.vv -- 2.39.5