[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-29 8b4a494d8d4: Fix GNUSTEP tests on EMBA
From: |
Michael Albinus |
Subject: |
emacs-29 8b4a494d8d4: Fix GNUSTEP tests on EMBA |
Date: |
Sun, 26 Mar 2023 08:20:18 -0400 (EDT) |
branch: emacs-29
commit 8b4a494d8d4413ae6d566f6478f84e319aeaacdd
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
Fix GNUSTEP tests on EMBA
* configure.ac (LIBS_GNUSTEP): Adapt CPPFLAGS and CFLAGS. (Bug#62210)
Proposed by Po Lu <luangruo@yahoo.com>.
* test/infra/gitlab-ci.yml (build-image-gnustep)
(test-gnustep): Uncomment jobs.
---
configure.ac | 4 ++--
test/infra/gitlab-ci.yml | 32 +++++++++++++++-----------------
2 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/configure.ac b/configure.ac
index c818343a5ad..aa78c7a16dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2059,8 +2059,8 @@ if test "${with_ns}" != no; then
GNUSTEP_LOCAL_HEADERS="-I${GNUSTEP_LOCAL_HEADERS}"
test "x${GNUSTEP_LOCAL_LIBRARIES}" != "x" && \
GNUSTEP_LOCAL_LIBRARIES="-L${GNUSTEP_LOCAL_LIBRARIES}"
- CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
- CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
+ CPPFLAGS="$CPPFLAGS -isystem ${GNUSTEP_SYSTEM_HEADERS}
${GNUSTEP_LOCAL_HEADERS}"
+ CFLAGS="$CFLAGS -isystem ${GNUSTEP_SYSTEM_HEADERS}
${GNUSTEP_LOCAL_HEADERS}"
LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}
${GNUSTEP_LOCAL_LIBRARIES}"
LIBS_GNUSTEP="-lgnustep-gui -lgnustep-base -lobjc -lpthread"
dnl GNUstep defines BASE_NATIVE_OBJC_EXCEPTIONS to 0 or 1.
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 41778321773..de1148460aa 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -229,24 +229,22 @@ test-filenotify-gio:
# This is needed in order to get a JUnit test report.
make_params: '-k -C test check-expensive
LOGFILES="lisp/autorevert-tests.log lisp/filenotify-tests.log"'
-# The next two jobs are commented out due to bug#62210.
-
-# build-image-gnustep:
-# stage: platform-images
-# extends: [.job-template, .build-template, .gnustep-template]
-# variables:
-# target: emacs-gnustep
+build-image-gnustep:
+ stage: platform-images
+ extends: [.job-template, .build-template, .gnustep-template]
+ variables:
+ target: emacs-gnustep
-# test-gnustep:
-# # This tests the GNUstep build process.
-# stage: platforms
-# extends: [.job-template, .gnustep-template]
-# needs:
-# - job: build-image-gnustep
-# optional: true
-# variables:
-# target: emacs-gnustep
-# make_params: install
+test-gnustep:
+ # This tests the GNUstep build process.
+ stage: platforms
+ extends: [.job-template, .gnustep-template]
+ needs:
+ - job: build-image-gnustep
+ optional: true
+ variables:
+ target: emacs-gnustep
+ make_params: install
# The next two jobs are commented out due to high workload on
# emba.gnu.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-29 8b4a494d8d4: Fix GNUSTEP tests on EMBA,
Michael Albinus <=