Try again and relax the windows test too

Author: arsenm

clang/test/Driver/hip-temps-linux.hip

@@ -1,19 +1,17 @@
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 
-// Check no temporary files or directories are left after compilation.
-
-// RUN: rm -rf %t%{fs-sep}mytmp
-// RUN: mkdir -p %t%{fs-sep}mytmp
-// RUN: env TMPDIR="%t%{fs-sep}mytmp" TEMP="%t%{fs-sep}mytmp" TMP="%t%{fs-sep}mytmp" %clang --target=x86_64-linux-gnu \
-// RUN:   -nogpulib -nogpuinc -nostdinc -nostdlib \
-// RUN:   --rocm-path=%S/Inputs/rocm -c \
+// Check no temporary files or directores are left after compilation.
+// RUN: rm -rf %t/mytmp
+// RUN: mkdir -p %t/mytmp
+// RUN: env TMP="%t/mytmp" TMPDIR="%t/mytmp" %clang --target=x86_64-linux-gnu -nogpulib -nogpuinc \
+// RUN:   --rocm-path=%S/Inputs/rocm -nostdinc -nostdlib -c \
 // RUN:   --offload-arch=gfx1030 -emit-llvm -v %s 2>&1 | \
-// RUN:   FileCheck -DTMPDIR=%t%{fs-sep}mytmp%{fs-sep} %s
-// RUN: ls %t%{fs-sep}mytmp >%t%{fs-sep}mytmp.txt 2>&1
-// RUN: touch %t%{fs-sep}empty.txt
-// RUN: diff %t%{fs-sep}mytmp.txt %t%{fs-sep}empty.txt
+// RUN:   FileCheck -check-prefixes=CHECK -DOUTPUT_PATH=%t%{fs-sep}mytmp%{fs-sep} %s
+// RUN: ls %t/mytmp >%t/mytmp.txt 2>&1
+// RUN: touch %t/empty.txt
+// RUN: diff %t/mytmp.txt %t/empty.txt
 
-// CHECK: -o {{.*}}[[TMPDIR]]hip-temps-linux-gfx1030-{{.*}}.bc
+// CHECK: -o {{"?}}[[OUTPUT_PATH]]hip-temps-linux-gfx1030-{{.*}}.bc{{"?}}
 
 int main() {}

clang/test/Driver/hip-temps-windows.hip

@@ -1,18 +1,17 @@
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
-// REQUIRES: system-windows
 
 // Check no temporary files or directores are left after compilation.
 // RUN: rm -rf %t/mytmp
 // RUN: mkdir -p %t/mytmp
-// RUN: env TMP="%t/mytmp" %clang --target=x86_64-pc-windows-msvc -nogpulib -nogpuinc \
+// RUN: env TMP="%t/mytmp" TMPDIR="%t/mytmp" %clang --target=x86_64-pc-windows-msvc -nogpulib -nogpuinc \
 // RUN:   --rocm-path=%S/Inputs/rocm -nostdinc -nostdlib -c \
 // RUN:   --offload-arch=gfx1030 -emit-llvm -v %s 2>&1 | \
-// RUN:   FileCheck -check-prefixes=CHECK %s
+// RUN:   FileCheck -check-prefixes=CHECK -DOUTPUT_PATH=%t%{fs-sep}mytmp%{fs-sep} %s
 // RUN: ls %t/mytmp >%t/mytmp.txt 2>&1
 // RUN: touch %t/empty.txt
 // RUN: diff %t/mytmp.txt %t/empty.txt
 
-// CHECK: -o "{{.*}}mytmp{{/|\\\\}}hip-temps-windows-gfx1030-{{.*}}.bc"
+// CHECK: -o [[OUTPUT_PATH]]hip-temps-windows-gfx1030-{{.*}}.bc
 
 int main() {}