[Git][ghc/ghc][wip/24286] testsuite: rename objcpp -> objcxx

[Zubin (@wz1000)]

Zubin pushed to branch wip/24286 at Glasgow Haskell Compiler / GHC


Commits:
1740174b by Zubin Duggal at 2024-01-10T12:21:03+05:30
testsuite: rename objcpp -> objcxx

To avoid confusion with C Pre Processsor

- - - - -


5 changed files:

- testsuite/driver/testglobals.py
- testsuite/driver/testlib.py
- testsuite/tests/driver/objc/all.T
- testsuite/tests/driver/objc/objcpp-hi.mm → testsuite/tests/driver/objc/objcxx-hi.mm
- testsuite/tests/driver/objc/objcpp-hi.stdout → testsuite/tests/driver/objc/objcxx-hi.stdout


Changes:

=====================================
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


=====================================
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')


=====================================
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++'])


=====================================
testsuite/tests/driver/objc/objcpp-hi.mm → testsuite/tests/driver/objc/objcxx-hi.mm
=====================================


=====================================
testsuite/tests/driver/objc/objcpp-hi.stdout → testsuite/tests/driver/objc/objcxx-hi.stdout
=====================================



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1740174b7eee2ef5b3aac800a132ac33c8cb2776

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1740174b7eee2ef5b3aac800a132ac33c8cb2776
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20240110/6861f504/attachment-0001.html>