From fd0234077e88337ade003e26d74aebea26bbc74e Mon Sep 17 00:00:00 2001 From: Curtis Jacques Bezault Date: Mon, 11 Jan 2021 10:27:59 -0800 Subject: [PATCH 1/3] Test each list which can contain /BE independently --- .../P1502R1_standard_library_header_units/custom_format.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/std/tests/P1502R1_standard_library_header_units/custom_format.py b/tests/std/tests/P1502R1_standard_library_header_units/custom_format.py index 9c5c3858e9f..ff918443279 100644 --- a/tests/std/tests/P1502R1_standard_library_header_units/custom_format.py +++ b/tests/std/tests/P1502R1_standard_library_header_units/custom_format.py @@ -93,9 +93,10 @@ def getBuildSteps(self, test, litConfig, shared): outputDir, outputBase = test.getTempPaths() sourcePath = test.getSourcePath() - compileTestCppWithEdg = '/BE' in itertools.chain(test.flags, test.compileFlags) - if compileTestCppWithEdg: + if '/BE' in test.flags: test.flags.remove('/BE') + + if '/BE' in test.compileFlags: test.compileFlags.remove('/BE') exportHeaderOptions = ['/exportHeader', '/Fo', '/MP'] From 907eef48f4aac97b5cda933c882bc63f630fb609 Mon Sep 17 00:00:00 2001 From: Curtis Jacques Bezault Date: Mon, 11 Jan 2021 10:29:33 -0800 Subject: [PATCH 2/3] itertools is no longer needed --- .../tests/P1502R1_standard_library_header_units/custom_format.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/std/tests/P1502R1_standard_library_header_units/custom_format.py b/tests/std/tests/P1502R1_standard_library_header_units/custom_format.py index ff918443279..e3ccc400a31 100644 --- a/tests/std/tests/P1502R1_standard_library_header_units/custom_format.py +++ b/tests/std/tests/P1502R1_standard_library_header_units/custom_format.py @@ -1,7 +1,6 @@ # Copyright (c) Microsoft Corporation. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -import itertools import os from stl.test.format import STLTestFormat, TestStep From e98208070121bcbed239aa0afd26011a9759a200 Mon Sep 17 00:00:00 2001 From: Curtis Jacques Bezault Date: Mon, 11 Jan 2021 10:31:27 -0800 Subject: [PATCH 3/3] We still need compileTestCppWithEdg --- .../P1502R1_standard_library_header_units/custom_format.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/std/tests/P1502R1_standard_library_header_units/custom_format.py b/tests/std/tests/P1502R1_standard_library_header_units/custom_format.py index e3ccc400a31..8fe322f324d 100644 --- a/tests/std/tests/P1502R1_standard_library_header_units/custom_format.py +++ b/tests/std/tests/P1502R1_standard_library_header_units/custom_format.py @@ -92,10 +92,13 @@ def getBuildSteps(self, test, litConfig, shared): outputDir, outputBase = test.getTempPaths() sourcePath = test.getSourcePath() + compileTestCppWithEdg = False if '/BE' in test.flags: + compileTestCppWithEdg = True test.flags.remove('/BE') if '/BE' in test.compileFlags: + compileTestCppWithEdg = True test.compileFlags.remove('/BE') exportHeaderOptions = ['/exportHeader', '/Fo', '/MP']