Skip to content

Commit

Permalink
Remove unused test_suite targets and enable def_parser test
Browse files Browse the repository at this point in the history
Fix object file extension

Closes: #13609
  • Loading branch information
meteorcloudy committed Jun 28, 2021
1 parent a3fe02a commit 49744d3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 21 deletions.
18 changes: 0 additions & 18 deletions third_party/def_parser/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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__"],
)
6 changes: 3 additions & 3 deletions third_party/def_parser/def_parser_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand All @@ -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])

Expand All @@ -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])
Expand Down

0 comments on commit 49744d3

Please sign in to comment.