From 49744d3a0d0db75d647f8322dda2281939cb4c36 Mon Sep 17 00:00:00 2001 From: Yun Peng Date: Fri, 25 Jun 2021 10:39:02 +0200 Subject: [PATCH] Remove unused test_suite targets and enable def_parser test Fix object file extension Closes: https://github.com/bazelbuild/bazel/pull/13609 --- third_party/def_parser/BUILD | 18 ------------------ third_party/def_parser/def_parser_test.py | 6 +++--- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/third_party/def_parser/BUILD b/third_party/def_parser/BUILD index aaa994e328a0b9..93a9a53e758f88 100644 --- a/third_party/def_parser/BUILD +++ b/third_party/def_parser/BUILD @@ -31,7 +31,6 @@ py_test( "//src/conditions:windows": ["def_parser_test.py"], "//conditions:default": ["empty_test.py"], }), - tags = ["no_windows"], main = select({ "//src/conditions:windows": "def_parser_test.py", "//conditions:default": "empty_test.py", @@ -51,20 +50,3 @@ filegroup( "//third_party:__pkg__", ], ) - -test_suite( - name = "windows_tests", - tags = [ - "-no_windows", - "-slow", - ], - visibility = ["//visibility:private"], -) - -test_suite( - name = "all_windows_tests", - tests = [ - ":windows_tests", - ], - visibility = ["//third_party:__pkg__"], -) diff --git a/third_party/def_parser/def_parser_test.py b/third_party/def_parser/def_parser_test.py index a413c3ad5a982a..0e1df139be1eed 100644 --- a/third_party/def_parser/def_parser_test.py +++ b/third_party/def_parser/def_parser_test.py @@ -41,7 +41,7 @@ def testParseDefFileFromObjectFile(self): self.AssertExitCode(exit_code, 0, stderr) bazel_bin = stdout[0] - objfile = os.path.join(bazel_bin, '_objs', 'hello', 'x.o') + objfile = os.path.join(bazel_bin, '_objs', 'hello', 'x.obj') self.assertTrue(os.path.isfile(objfile)) output_def = self.Path('x.def'); self.RunProgram([self.Rlocation('io_bazel/third_party/def_parser/def_parser.exe'), output_def, 'my_x.dll', objfile]) @@ -63,7 +63,7 @@ def testParseDefFileFromObjectFileWithParamFile(self): self.AssertExitCode(exit_code, 0, stderr) bazel_bin = stdout[0] - objfile = os.path.join(bazel_bin, '_objs', 'hello', 'x.o') + objfile = os.path.join(bazel_bin, '_objs', 'hello', 'x.obj') self.assertTrue(os.path.isfile(objfile)) objfilelist = self.ScratchFile('objfilelist', [objfile]) @@ -88,7 +88,7 @@ def testParseDefFileFromAnotherDefFile(self): self.AssertExitCode(exit_code, 0, stderr) bazel_bin = stdout[0] - objfile = os.path.join(bazel_bin, '_objs', 'hello', 'x.o') + objfile = os.path.join(bazel_bin, '_objs', 'hello', 'x.obj') self.assertTrue(os.path.isfile(objfile)) output_def = self.Path('x.def'); self.RunProgram([self.Rlocation('io_bazel/third_party/def_parser/def_parser.exe'), output_def, 'my_x.dll', objfile])