Skip to content

Commit f705978

Browse files
committed
Merge branch 'topic/fix_gh_ci' into 'edge'
Fix testsuite on Windows and Mac OS X See merge request eng/ide/ada_language_server!1148
2 parents d1f072c + 7746d84 commit f705978

File tree

2 files changed

+5
-5
lines changed
  • testsuite/ada_lsp

2 files changed

+5
-5
lines changed

testsuite/ada_lsp/project_config.alire/alr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
set -e
33
# A dummy Alire replacement for testing purposes
44
while [ $# -gt 1 ] ; do shift ; done
5-
DIR=`dirname $(realpath $0)`
5+
DIR=`cd $(dirname $0); pwd`
66
sed -e "s#\${DIR}#${DIR}#g" .alr_$1

testsuite/ada_lsp/show_dependencies.aggregate/test.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -179,19 +179,19 @@
179179
"result": [
180180
{
181181
"uri": "$URI{common/common_pack.ads}",
182-
"projectUri": "$URI{}${DIR_SEP}"
182+
"projectUri": "$URI{/}"
183183
},
184184
{
185185
"uri": "$URI{common/common_pack.ads}",
186-
"projectUri": "$URI{}${DIR_SEP}"
186+
"projectUri": "$URI{/}"
187187
},
188188
{
189189
"uri": "$URI{p/main.adb}",
190-
"projectUri": "$URI{}${DIR_SEP}"
190+
"projectUri": "$URI{/}"
191191
},
192192
{
193193
"uri": "$URI{q/main.adb}",
194-
"projectUri": "$URI{}${DIR_SEP}"
194+
"projectUri": "$URI{/}"
195195
}
196196
]
197197
}

0 commit comments

Comments
 (0)