From 76609c79b2db80b1dee52065e2d0a93757ecb65f Mon Sep 17 00:00:00 2001 From: Laszlo Csomor Date: Tue, 16 Apr 2019 14:05:35 +0200 Subject: [PATCH] Windows: fix jasmine_node_test on Windows with TW Fix the jasmine_node_test() rule on Windows when tested with Bazel's Windows-native test wrapper (see https://github.com/bazelbuild/bazel/issues/5508). jasmine_node_test now uses nodejs_test_macro, so on Windows it depends on the sh_test (whose output is an .exe file) and not on nodejs_test (whose output is a .sh file). The native test wrapper can't test nodejs_test directly because it can't create a subprocess for an .sh file. --- internal/jasmine_node_test/jasmine_node_test.bzl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/internal/jasmine_node_test/jasmine_node_test.bzl b/internal/jasmine_node_test/jasmine_node_test.bzl index 8b19e7d2a4..075af42a49 100644 --- a/internal/jasmine_node_test/jasmine_node_test.bzl +++ b/internal/jasmine_node_test/jasmine_node_test.bzl @@ -19,7 +19,7 @@ than launching a test in Karma, for example. """ load("//internal/common:devmode_js_sources.bzl", "devmode_js_sources") -load("//internal/node:node.bzl", "nodejs_test") +load("//internal/node:node.bzl", "nodejs_test_macro") def jasmine_node_test( name, @@ -59,15 +59,13 @@ def jasmine_node_test( all_data = data + srcs + deps all_data += [Label("//internal/jasmine_node_test:jasmine_runner.js")] all_data += [":%s_devmode_srcs.MF" % name] - all_data += [Label("@bazel_tools//tools/bash/runfiles")] entry_point = "build_bazel_rules_nodejs/internal/jasmine_node_test/jasmine_runner.js" - nodejs_test( + nodejs_test_macro( name = name, data = all_data, entry_point = entry_point, templated_args = ["$(location :%s_devmode_srcs.MF)" % name], - testonly = 1, expected_exit_code = expected_exit_code, tags = tags, **kwargs