[Git][ghc/ghc][wip/ghc-9.12-release] 3 commits: testsuite: Introduce req_c_rts

Zubin (@wz1000) gitlab at gitlab.haskell.org
Fri Dec 13 06:40:34 UTC 2024



Zubin pushed to branch wip/ghc-9.12-release at Glasgow Haskell Compiler / GHC


Commits:
5381ad7e by Ben Gamari at 2024-12-13T12:10:07+05:30
testsuite: Introduce req_c_rts

As suggested by @hsyl20, this is intended to mark tests that rely on the
behavior of the C RTS.

(cherry picked from commit 1e84b41108d96cb721dd11281105fdf621105a12)

- - - - -
bd06c179 by Zubin Duggal at 2024-12-13T12:10:07+05:30
release: copy index.html from correct directory

- - - - -
4ce35a2c by Zubin Duggal at 2024-12-13T12:10:07+05:30
RELEASE=YES

- - - - -


3 changed files:

- .gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py
- configure.ac
- testsuite/driver/testlib.py


Changes:

=====================================
.gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py
=====================================
@@ -132,7 +132,7 @@ def fetch_artifacts(release: str, pipeline_id: int,
                 for f in doc_files:
                     subprocess.run(['tar', '-xf', f, '-C', dest])
                     logging.info(f'extracted docs {f} to {dest}')
-                index_path = destdir / 'index.html'
+                index_path = destdir / 'docs' / 'index.html'
                 index_path.replace(dest / 'index.html')
             elif job.name == 'hackage-doc-tarball':
                 dest = dest_dir / 'hackage_docs'


=====================================
configure.ac
=====================================
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.12.0], [glasgow-haskell-bugs at haskell.org], [ghc-AC_PACKAGE_VERSION])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.12.1], [glasgow-haskell-bugs at haskell.org], [ghc-AC_PACKAGE_VERSION])
     # Version on master must be X.Y (not X.Y.Z) for ProjectVersionMunged variable
     # to be useful (cf #19058). However, the version must have three components
     # (X.Y.Z) on stable branches (e.g. ghc-9.2) to ensure that pre-releases are
@@ -22,7 +22,7 @@ AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.12.0], [glasgow-ha
 AC_CONFIG_MACRO_DIRS([m4])
 
 # Set this to YES for a released version, otherwise NO
-: ${RELEASE=NO}
+: ${RELEASE=YES}
 
 # The primary version (e.g. 7.5, 7.4.1) is set in the AC_INIT line
 # above.  If this is not a released version, then we will append the


=====================================
testsuite/driver/testlib.py
=====================================
@@ -270,6 +270,10 @@ def req_bco( name, opts ):
     # JS backend doesn't support ByteCode
     js_skip(name, opts)
 
+def req_c_rts( name, opts ):
+    """ Require the C runtime system (rather than, e.g. the Javascript RTS). """
+    js_skip(name, opts)
+
 def req_rts_linker( name, opts ):
     if not config.have_RTS_linker:
         opts.expect = 'fail'



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ba0bbedc6b14547bf8bd056b111373b6003de2a9...4ce35a2ce823a20fca25e1ccbbbac8931d2fa2ca

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ba0bbedc6b14547bf8bd056b111373b6003de2a9...4ce35a2ce823a20fca25e1ccbbbac8931d2fa2ca
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/20241213/0ee972ff/attachment-0001.html>


More information about the ghc-commits mailing list