Skip to content

Commit

Permalink
Merge branch 'topic/vadim/win' into 'master'
Browse files Browse the repository at this point in the history
Fix GDBPP test on Windows

See merge request eng/ide/VSS!332
  • Loading branch information
godunko committed Jul 8, 2024
2 parents 96a6d33 + 63fa6b2 commit ad90a73
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 6 deletions.
37 changes: 32 additions & 5 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
include:
- component: $CI_SERVER_FQDN/eng/gitlab-templates/windows-ci@main

variables:
# The common part of the URL for cloning from within a CI
GIT_CLONE_BASE: https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}
Expand Down Expand Up @@ -143,11 +146,7 @@ build_and_test_dev:
junit: .xunit-logs/*.xml


build_and_test:
services:
- image:pe-base
- cpu:8
- mem:16
.build_and_test:
stage: build_and_test
rules:
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
Expand All @@ -159,6 +158,34 @@ build_and_test:
- anod test vss $ACI_TRACK_QUALIFIER --latest
- testsuite_reports

build_and_test_linux:
extends: .build_and_test
services:
- image:pe-base
- cpu:8
- mem:16

build_and_test_windows:
extends: .build_and_test
rules:
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
when: manual
before_script:
- export CYGWIN=nodosfilewarning # Remove confusing Cygwin warning
- set -o igncr # Remove trailing ^M in Cygwin
- export SHELLOPTS
- export PYTHONIOENCODING=utf-8:surrogateescape
services:
- image:e3-windows-core-2022
- cpu:8
- platform:x86_64-windows-2022

build_and_test_linux:
extends: .build_and_test
services:
- image:pe-base
- cpu:8
- mem:16

build_gnatdoc:
services:
Expand Down
File renamed without changes.
31 changes: 31 additions & 0 deletions testsuite/gdbpp/gdbinit.windows
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
set logging redirect on
set logging file NUL
set logging enabled on
# Redirecting of the output to file and enable logging send all GDB's output
# into the file. Logging is disabled a bit later when output of the
# 'output'/'echo' commands need to be output to the standard output to check
# with expected results.

source vss_pp.py

start
set charset UTF-8
next
next
next
next
next

set logging enabled off
output ss1
echo \n
output us1
echo \n
output vsn
echo \n
output vs1
echo \n
output vs2
echo \n
output vi1
echo \n
6 changes: 5 additions & 1 deletion testsuite/gdbpp/test.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
gprbuild -q -P test.gpr
gdb --batch --command=gdbinit --directory=$VSS_GDBPP .objs/main
if [ "$OS" = "Windows_NT" ]; then
gdb --batch --command=gdbinit.windows --directory=$VSS_GDBPP .objs/main
else
gdb --batch --command=gdbinit.posix --directory=$VSS_GDBPP .objs/main
fi

0 comments on commit ad90a73

Please sign in to comment.