mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

Fix GNUSTEP tests on EMBA

Browse Source 
* 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.
This commit is contained in:
Michael Albinus 2023-03-26 14:20:05 +02:00
parent a952bdd6af
commit 8b4a494d8d
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -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.

32
test/infra/gitlab-ci.yml
View File

@ -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.