From 2cf9dd961d7be03730fcd5020d925ceab2f6316a Mon Sep 17 00:00:00 2001
From: Zubin Duggal <zubin.duggal@gmail.com>
Date: Mon, 8 Jan 2024 15:58:40 +0530
Subject: [PATCH] testsuite: rename objcpp -> objcxx
To avoid confusion with C Pre Processsor
---
testsuite/driver/testglobals.py | 2 +-
testsuite/driver/testlib.py | 8 ++++----
testsuite/tests/driver/objc/all.T | 4 ++--
.../tests/driver/objc/{objcpp-hi.mm => objcxx-hi.mm} | 0
.../driver/objc/{objcpp-hi.stdout => objcxx-hi.stdout} | 0
5 files changed, 7 insertions(+), 7 deletions(-)
rename testsuite/tests/driver/objc/{objcpp-hi.mm => objcxx-hi.mm} (100%)
rename testsuite/tests/driver/objc/{objcpp-hi.stdout => objcxx-hi.stdout} (100%)
diff --git a/testsuite/driver/testglobals.py b/testsuite/driver/testglobals.py
index 428b44f0cec0..cf78e3fdf8d5 100644
--- a/testsuite/driver/testglobals.py
+++ b/testsuite/driver/testglobals.py
@@ -403,7 +403,7 @@ class TestOptions:
self.c_src = False
self.cxx_src = False
self.objc_src = False
- self.objcpp_src = False
+ self.objcxx_src = False
# Does this test use a .cmm file?
self.cmm_src = False
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 62bad2ad1668..fc81f169aafe 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -967,8 +967,8 @@ def cxx_src( name, opts ):
def objc_src( name, opts ):
opts.objc_src = True
-def objcpp_src( name, opts ):
- opts.objcpp_src = True
+def objcxx_src( name, opts ):
+ opts.objcxx_src = True
def cmm_src( name, opts ):
opts.cmm_src = True
@@ -1961,7 +1961,7 @@ async def simple_build(name: Union[TestName, str],
if (getTestOpts().c_src or
getTestOpts().cxx_src or
getTestOpts().objc_src or
- getTestOpts().objcpp_src):
+ getTestOpts().objcxx_src):
extra_hc_opts += ' -no-hs-main '
if getTestOpts().compile_cmd_prefix == '':
@@ -2938,7 +2938,7 @@ def add_hs_lhs_suffix(name: str) -> Path:
return add_suffix(name, 'cpp')
elif getTestOpts().objc_src:
return add_suffix(name, 'm')
- elif getTestOpts().objcpp_src:
+ elif getTestOpts().objcxx_src:
return add_suffix(name, 'mm')
elif getTestOpts().literate:
return add_suffix(name, 'lhs')
diff --git a/testsuite/tests/driver/objc/all.T b/testsuite/tests/driver/objc/all.T
index 1d5d134173e7..17342487ae94 100644
--- a/testsuite/tests/driver/objc/all.T
+++ b/testsuite/tests/driver/objc/all.T
@@ -12,8 +12,8 @@ test('objc-hi',
expect_fail_for(['ghci']) ],
compile_and_run, ['-framework Foundation'])
-test('objcpp-hi',
+test('objcxx-hi',
[ skip_if_not_osx,
- objcpp_src,
+ objcxx_src,
expect_fail_for(['ghci']) ],
compile_and_run, ['-framework Foundation -lc++'])
diff --git a/testsuite/tests/driver/objc/objcpp-hi.mm b/testsuite/tests/driver/objc/objcxx-hi.mm
similarity index 100%
rename from testsuite/tests/driver/objc/objcpp-hi.mm
rename to testsuite/tests/driver/objc/objcxx-hi.mm
diff --git a/testsuite/tests/driver/objc/objcpp-hi.stdout b/testsuite/tests/driver/objc/objcxx-hi.stdout
similarity index 100%
rename from testsuite/tests/driver/objc/objcpp-hi.stdout
rename to testsuite/tests/driver/objc/objcxx-hi.stdout
--
GitLab