From c0b49db62a17549bd93e8b83bea20ea79eebe708 Mon Sep 17 00:00:00 2001 From: Michael Toguchi Date: Fri, 20 Sep 2024 11:19:32 -0700 Subject: [PATCH] [SYCL][NFC] Re-enable sycl.c test on Windows (#15433) The issue dealt with the resetting of the PATH environment variable. This was masking potential runtime dependencies (DLLs and such) for other tools being used when running the test. The solution is to append the PATH for the dummy `aoc` instead of overwriting. --- clang/test/Driver/sycl.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/clang/test/Driver/sycl.c b/clang/test/Driver/sycl.c index c248829ce1fcb..322315673b4e1 100644 --- a/clang/test/Driver/sycl.c +++ b/clang/test/Driver/sycl.c @@ -1,6 +1,3 @@ -// Failing on Windows - temporarily disable -// REQUIRES: system-linux - // RUN: %clang -### -fsycl -c %s 2>&1 | FileCheck %s --check-prefix=ENABLED // RUN: %clang -### -fsycl %s 2>&1 | FileCheck %s --check-prefix=ENABLED // RUN: %clang -### -fno-sycl -fsycl %s 2>&1 | FileCheck %s --check-prefix=ENABLED @@ -107,7 +104,7 @@ // Test with a bad argument is expected to fail // RUN: not %clang -fsycl-help=foo %s 2>&1 | FileCheck %s --check-prefix=SYCL-HELP-BADARG // RUN: %clang -### -fsycl-help=gen %s 2>&1 | FileCheck %s --check-prefix=SYCL-HELP-GEN -// RUN: env PATH=%t-sycl-dir %clang -### -fsycl-help=fpga %s 2>&1 | FileCheck %s --check-prefixes=SYCL-HELP-FPGA,SYCL-HELP-FPGA-OUT -DDIR=%t-sycl-dir +// RUN: env "PATH=%t-sycl-dir%{pathsep}%PATH%" %clang -### -fsycl-help=fpga %s 2>&1 | FileCheck %s --check-prefixes=SYCL-HELP-FPGA,SYCL-HELP-FPGA-OUT -DDIR=%t-sycl-dir // RUN: %clang -### -fsycl-help=x86_64 %s 2>&1 | FileCheck %s --check-prefix=SYCL-HELP-CPU // RUN: %clang -### -fsycl-help %s 2>&1 | FileCheck %s --check-prefixes=SYCL-HELP-GEN,SYCL-HELP-FPGA,SYCL-HELP-CPU // SYCL-HELP-BADARG: unsupported argument 'foo' to option '-fsycl-help='