From afbd36f153afc6cfe7a07baa42076e50b2d63d96 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2@gmail.com>
Date: Tue, 16 May 2023 07:48:13 -0700
Subject: [PATCH] [libc++][NFC] Rename the 'noexceptions' CI config to
 'no-exceptions' for consistency

Differential Revision: https://reviews.llvm.org/D150672
---
 ...b-noexceptions.cmake => Armv7Thumb-no-exceptions.cmake} |  0
 ...b-noexceptions.cmake => Armv8Thumb-no-exceptions.cmake} |  0
 ...eric-noexceptions.cmake => Generic-no-exceptions.cmake} |  0
 libcxx/utils/ci/buildkite-pipeline.yml                     |  8 ++++----
 libcxx/utils/ci/run-buildbot                               | 14 +++++++-------
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename libcxx/cmake/caches/{Armv7Thumb-noexceptions.cmake => Armv7Thumb-no-exceptions.cmake} (100%)
 rename libcxx/cmake/caches/{Armv8Thumb-noexceptions.cmake => Armv8Thumb-no-exceptions.cmake} (100%)
 rename libcxx/cmake/caches/{Generic-noexceptions.cmake => Generic-no-exceptions.cmake} (100%)

diff --git a/libcxx/cmake/caches/Armv7Thumb-noexceptions.cmake b/libcxx/cmake/caches/Armv7Thumb-no-exceptions.cmake
similarity index 100%
rename from libcxx/cmake/caches/Armv7Thumb-noexceptions.cmake
rename to libcxx/cmake/caches/Armv7Thumb-no-exceptions.cmake
diff --git a/libcxx/cmake/caches/Armv8Thumb-noexceptions.cmake b/libcxx/cmake/caches/Armv8Thumb-no-exceptions.cmake
similarity index 100%
rename from libcxx/cmake/caches/Armv8Thumb-noexceptions.cmake
rename to libcxx/cmake/caches/Armv8Thumb-no-exceptions.cmake
diff --git a/libcxx/cmake/caches/Generic-noexceptions.cmake b/libcxx/cmake/caches/Generic-no-exceptions.cmake
similarity index 100%
rename from libcxx/cmake/caches/Generic-noexceptions.cmake
rename to libcxx/cmake/caches/Generic-no-exceptions.cmake
diff --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml
index 474138d..3323fdb 100644
--- a/libcxx/utils/ci/buildkite-pipeline.yml
+++ b/libcxx/utils/ci/buildkite-pipeline.yml
@@ -646,7 +646,7 @@ steps:
       timeout_in_minutes: 120
 
     - label: "No exceptions"
-      command: "libcxx/utils/ci/run-buildbot generic-noexceptions"
+      command: "libcxx/utils/ci/run-buildbot generic-no-exceptions"
       artifact_paths:
         - "**/test-results.xml"
         - "**/*.abilist"
@@ -919,7 +919,7 @@ steps:
       timeout_in_minutes: 120
 
     - label: "AArch64 -fno-exceptions"
-      command: "libcxx/utils/ci/run-buildbot aarch64-noexceptions"
+      command: "libcxx/utils/ci/run-buildbot aarch64-no-exceptions"
       artifact_paths:
         - "**/test-results.xml"
         - "**/*.abilist"
@@ -947,7 +947,7 @@ steps:
       timeout_in_minutes: 120
 
     - label: "Armv8 -fno-exceptions"
-      command: "libcxx/utils/ci/run-buildbot armv8-noexceptions"
+      command: "libcxx/utils/ci/run-buildbot armv8-no-exceptions"
       artifact_paths:
         - "**/test-results.xml"
         - "**/*.abilist"
@@ -975,7 +975,7 @@ steps:
       timeout_in_minutes: 120
 
     - label: "Armv7 -fno-exceptions"
-      command: "libcxx/utils/ci/run-buildbot armv7-noexceptions"
+      command: "libcxx/utils/ci/run-buildbot armv7-no-exceptions"
       artifact_paths:
         - "**/test-results.xml"
         - "**/*.abilist"
diff --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot
index cd70d73..17ff2d6 100755
--- a/libcxx/utils/ci/run-buildbot
+++ b/libcxx/utils/ci/run-buildbot
@@ -434,9 +434,9 @@ generic-no-experimental)
     check-runtimes
     check-abi-list
 ;;
-generic-noexceptions)
+generic-no-exceptions)
     clean
-    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-noexceptions.cmake"
+    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-no-exceptions.cmake"
     check-runtimes
     check-abi-list
 ;;
@@ -556,7 +556,7 @@ aarch64)
     generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/AArch64.cmake"
     check-runtimes
 ;;
-aarch64-noexceptions)
+aarch64-no-exceptions)
     clean
     generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/AArch64.cmake" \
                    -DLIBCXX_ENABLE_EXCEPTIONS=OFF \
@@ -569,9 +569,9 @@ armv8)
     generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv8Arm.cmake"
     check-runtimes
 ;;
-armv8-noexceptions)
+armv8-no-exceptions)
     clean
-    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv8Thumb-noexceptions.cmake"
+    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv8Thumb-no-exceptions.cmake"
     check-runtimes
 ;;
 # Armv7 32 bit. One building Arm only one Thumb only code.
@@ -580,9 +580,9 @@ armv7)
     generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv7Arm.cmake"
     check-runtimes
 ;;
-armv7-noexceptions)
+armv7-no-exceptions)
     clean
-    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv7Thumb-noexceptions.cmake"
+    generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Armv7Thumb-no-exceptions.cmake"
     check-runtimes
 ;;
 clang-cl-dll)
-- 
2.7.4