Fixes for Haiku tests on Win32

brad0 · brad0 · commit c184f27f55ab · 2023-09-09T00:13:26.000-04:00
diff --git a/clang/test/Driver/haiku.c b/clang/test/Driver/haiku.c
@@ -1,3 +1,5 @@
+// UNSUPPORTED: system-windows
+
 // Check the C header paths
 // RUN: %clang --target=x86_64-unknown-haiku -### %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-C-HEADER-PATH %s
diff --git a/clang/test/Driver/haiku.cpp b/clang/test/Driver/haiku.cpp
@@ -1,11 +1,11 @@
 // Check the C++ header path (libstdc++)
-// RUN: %clang++ --target=x86_64-unknown-haiku -### %s 2>&1 \
+// RUN: %clangxx --target=x86_64-unknown-haiku -### %s 2>&1 \
 // RUN:   --sysroot=%S/Inputs/haiku_x86_64_tree \
 // RUN:   | FileCheck --check-prefix=CHECK-LIBSTDCXX-HEADER-PATH %s
 // CHECK-LIBSTDCXX-HEADER-PATH: "-internal-isystem" "[[SYSROOT:[^"]+]]/boot/system/develop/headers/c++"
 
 // Check the C++ header path (when using libc++)
-// RUN: %clang++ --target=x86_64-unknown-haiku --stdlib=libc++ -### %s 2>&1 \
+// RUN: %clangxx --target=x86_64-unknown-haiku --stdlib=libc++ -### %s 2>&1 \
 // RUN:   --sysroot=%S/Inputs/haiku_x86_64_tree \
 // RUN:   | FileCheck --check-prefix=CHECK-LIBCXX-HEADER-PATH %s
 // CHECK-LIBCXX-HEADER-PATH: "-internal-isystem" "[[SYSROOT:[^"]+]]/boot/system/develop/headers/c++/v1"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// UNSUPPORTED: system-windows`
	`2`	`+`
`1`	`3`	`// Check the C header paths`
`2`	`4`	`// RUN: %clang --target=x86_64-unknown-haiku -### %s 2>&1 \`
`3`	`5`	`// RUN: \| FileCheck --check-prefix=CHECK-C-HEADER-PATH %s`