Add tests for program_name path function.

Simple clang test for now, tests in lld and other tools coming soon.

Author: dankm

clang/lib/Driver/ToolChain.cpp

@@ -326,7 +326,7 @@ static const DriverSuffix *FindDriverSuffix(StringRef ProgName, size_t &Pos) {
 /// Normalize the program name from argv[0] by stripping the file extension if
 /// present and lower-casing the string on Windows.
 static std::string normalizeProgramName(llvm::StringRef Argv0) {
-  std::string ProgName = std::string(llvm::sys::path::filename(Argv0));
+  std::string ProgName = std::string(sys::path::program_name(Argv0));
   if (is_style_windows(llvm::sys::path::Style::native)) {
     // Transform to lowercase for case insensitive file systems.
     std::transform(ProgName.begin(), ProgName.end(), ProgName.begin(),
@@ -345,13 +345,6 @@ static const DriverSuffix *parseDriverSuffix(StringRef ProgName, size_t &Pos) {
   // added via -target as implicit first argument.
   const DriverSuffix *DS = FindDriverSuffix(ProgName, Pos);
 
-  if (!DS && ProgName.endswith(".exe")) {
-    // Try again after stripping the executable suffix:
-    // clang++.exe -> clang++
-    ProgName = ProgName.drop_back(StringRef(".exe").size());
-    DS = FindDriverSuffix(ProgName, Pos);
-  }
-
   if (!DS) {
     // Try again after stripping any trailing version number:
     // clang++3.5 -> clang++

clang/unittests/Driver/ToolChainTest.cpp

@@ -430,6 +430,11 @@ TEST(ToolChainTest, GetTargetAndMode) {
   EXPECT_STREQ(Res.DriverMode, "--driver-mode=g++");
   EXPECT_TRUE(Res.TargetIsValid);
 
+  Res = ToolChain::getTargetAndModeFromProgramName(
+      "x86_64-unknown-freebsd13.2-clang-c++");
+  EXPECT_TRUE(Res.TargetPrefix == "x86_64-unknown-freebsd13.2");
+  EXPECT_TRUE(Res.TargetIsValid);
+
   Res = ToolChain::getTargetAndModeFromProgramName(
       "x86_64-linux-gnu-clang-c++-tot");
   EXPECT_TRUE(Res.TargetPrefix == "x86_64-linux-gnu");

llvm/test/tools/llvm-ar/tool-name.test

@@ -5,16 +5,21 @@
 # RUN: mkdir %t
 # RUN: ln -s llvm-ar %t/llvm-ar-9
 # RUN: ln -s llvm-ar %t/ar.exe
+# RUN: ln -s llvm-ar %t/x86_64-portbld-freebsd13.2-llvm-ar
+# RUN: ln -s llvm-ar %t/x86_64-portbld-freebsd13.2-llvm-ar.exe
 # RUN: ln -s llvm-ar %t/arm-pokymllib32-linux-gnueabi-llvm-ar-9
 
 # RUN: llvm-ar h | FileCheck %s --check-prefix=DEFAULT
 # RUN: %t/llvm-ar-9 h | FileCheck %s --check-prefix=VERSION
 # RUN: %t/ar.exe h | FileCheck %s --check-prefix=SUFFIX
+# RUN: %t/x86_64-portbld-freebsd13.2-llvm-ar h | FileCheck %s --check-prefix=TARGETDOT
+# RUN: %t/x86_64-portbld-freebsd13.2-llvm-ar.exe h | FileCheck %s --check-prefix=TARGETDOT
 ## Ensure that the "lib" substring does not result in misidentification as the
 ## llvm-lib tool.
 # RUN: %t/arm-pokymllib32-linux-gnueabi-llvm-ar-9 h | FileCheck %s --check-prefix=ARM
 
 # DEFAULT: USAGE: llvm-ar{{ }}
 # VERSION: USAGE: llvm-ar-9{{ }}
 # SUFFIX: USAGE: ar{{ }}
+# TARGETDOT: USAGE: x86_64-portbld-freebsd13.2-llvm-ar{{ }}
 # ARM: USAGE: arm-pokymllib32-linux-gnueabi-llvm-ar-9{{ }}

llvm/test/tools/llvm-objcopy/tool-name.test

@@ -5,11 +5,11 @@
 # RUN: mkdir %t
 
 # RUN: ln -s llvm-objcopy %t/llvm-objcopy-11.exe
-# RUN: ln -s llvm-objcopy %t/powerpc64-unknown-freebsd13-objcopy
+# RUN: ln -s llvm-objcopy %t/powerpc64-unknown-freebsd13.0-objcopy
 
 # RUN: llvm-objcopy --help | FileCheck --check-prefix=OBJCOPY %s
 # RUN: %t/llvm-objcopy-11.exe --help | FileCheck --check-prefix=OBJCOPY %s
-# RUN: %t/powerpc64-unknown-freebsd13-objcopy --help | FileCheck --check-prefix=OBJCOPY %s
+# RUN: %t/powerpc64-unknown-freebsd13.0-objcopy --help | FileCheck --check-prefix=OBJCOPY %s
 
 # OBJCOPY: OVERVIEW: llvm-objcopy tool
 

llvm/test/tools/llvm-objdump/tool-name.test

@@ -5,10 +5,10 @@
 # RUN: mkdir %t
 
 # RUN: ln -s llvm-objdump %t/llvm-otool-11.exe
-# RUN: ln -s llvm-objdump %t/powerpc64-unknown-freebsd13-objdump
+# RUN: ln -s llvm-objdump %t/powerpc64-unknown-freebsd13.0-objdump
 
 # RUN: %t/llvm-otool-11.exe --help | FileCheck --check-prefix=OTOOL %s
-# RUN: %t/powerpc64-unknown-freebsd13-objdump --help | \
+# RUN: %t/powerpc64-unknown-freebsd13.0-objdump --help | \
 # RUN:     FileCheck --check-prefix=OBJDUMP %s
 
 # OBJDUMP: OVERVIEW: llvm object file dumper

llvm/test/tools/llvm-ranlib/tool-name.test

@@ -5,11 +5,14 @@
 # RUN: mkdir %t
 # RUN: ln -s llvm-ranlib %t/llvm-ranlib-9
 # RUN: ln -s llvm-ranlib %t/ranlib.exe
+# RUN: ln -s llvm-ranlib %t/x86_64-unknown-freebsd13.2-llvm-ranlib
 
 # RUN: llvm-ranlib -h | FileCheck %s --check-prefix=DEFAULT
 # RUN: %t/llvm-ranlib-9 -h | FileCheck %s --check-prefix=VERSION
 # RUN: %t/ranlib.exe -h | FileCheck %s --check-prefix=SUFFIX
+# RUN: %t/x86_64-unknown-freebsd13.2-llvm-ranlib -h | FileCheck %s --check-prefix=TRIPLE
 
 # DEFAULT: USAGE: llvm-ranlib{{ }}
 # VERSION: USAGE: llvm-ranlib-9{{ }}
 # SUFFIX: USAGE: ranlib{{ }}
+# TRIPLE: USAGE: x86_64-unknown-freebsd13.2-llvm-ranlib{{ }}

llvm/unittests/Support/Path.cpp

@@ -1696,6 +1696,40 @@ TEST(Support, ReplacePathPrefix) {
   EXPECT_EQ(Path, "C:\\old/foo\\bar");
 }
 
+TEST(Support, FindProgramName) {
+  StringRef WindowsProgName =
+      path::program_name("C:\\Test\\foo.exe", path::Style::windows);
+  EXPECT_EQ(WindowsProgName, "foo");
+
+  StringRef WindowsProgNameManyDots = path::program_name(
+      "C:\\Test.7\\x86_64-freebsd14.0-clang.exe", path::Style::windows);
+  EXPECT_EQ(WindowsProgNameManyDots, "x86_64-freebsd14.0-clang");
+
+  StringRef PosixProgName =
+      path::program_name("/var/empty/clang.exe", path::Style::posix);
+  EXPECT_EQ(PosixProgName, "clang");
+
+  StringRef PosixProgNameManyDotsExe = path::program_name(
+      "/llvm-test16.4/x86_64-portbld-freebsd13.2-llvm-ar.exe",
+      path::Style::posix);
+  EXPECT_EQ(PosixProgNameManyDotsExe, "x86_64-portbld-freebsd13.2-llvm-ar");
+
+  StringRef PosixProgNameManyDots = path::program_name(
+      "/llvm-test16.4/x86_64-portbld-freebsd13.2-llvm-ar", path::Style::posix);
+  EXPECT_EQ(PosixProgNameManyDots, "x86_64-portbld-freebsd13.2-llvm-ar");
+
+  StringRef PosixProgNameSh =
+      path::program_name("/llvm-test16.4/x86_64-portbld-freebsd13.2-llvm-ar.sh",
+                         path::Style::posix);
+  EXPECT_EQ(PosixProgNameSh, "x86_64-portbld-freebsd13.2-llvm-ar.sh");
+
+  // TODO: determine if this is correct. What happens on windows with an executable
+  // named ".exe"?
+  StringRef OnlyExe =
+      path::program_name("/var/empty/.exe", path::Style::posix);
+  EXPECT_EQ(OnlyExe, "");
+}
+
 TEST_F(FileSystemTest, OpenFileForRead) {
   // Create a temp file.
   int FileDescriptor;