From 68acaa5d6aa65e89d99ac775b3d895fea91a3bae Mon Sep 17 00:00:00 2001 From: c-parsons Date: Thu, 20 Aug 2020 13:06:59 -0400 Subject: [PATCH] Improve inspect_output_dirs_test bin_dir comparison (#267) This should fix some buildkite CI flows, ensuring success of this test is no longer tied to the current compilation_mode. It also improves the error message of the offending evaluation. --- tests/unittest_tests.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unittest_tests.bzl b/tests/unittest_tests.bzl index 3ac98f0..3d5a198 100644 --- a/tests/unittest_tests.bzl +++ b/tests/unittest_tests.bzl @@ -196,7 +196,7 @@ def _inspect_output_dirs_test(ctx): asserts.false( env, bin_path == ctx.bin_dir.path, - "bin dir path expected to differ between test and target_under_test.", + "test bin dir (%s) expected to differ with target_under_test bin dir (%s)." % (bin_path, ctx.bin_dir.path), ) asserts.equals(env, bin_path, target_under_test[_OutputDirInfo].bin_path) return analysistest.end(env) @@ -217,7 +217,7 @@ inspect_output_dirs_test = analysistest.make( # The output directories differ between the test and target under test when # the target under test is under a config transition. config_settings = { - "//command_line_option:compilation_mode": "fastbuild", + "//command_line_option:minimum_os_version": "1234.5678", }, )