Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tinyxml2
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CodeLinaro
la
platform
external
tinyxml2
Commits
435c0a11
Unverified
Commit
435c0a11
authored
2 years ago
by
Lee Thomason
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #893 from eli-schwartz/meson-test-cleanup
meson: simplify test setup
parents
34dd03ec
f6c99165
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
meson.build
+1
-21
1 addition, 21 deletions
meson.build
with
1 addition
and
21 deletions
meson.build
+
1
−
21
View file @
435c0a11
...
...
@@ -62,26 +62,6 @@ if meson.version().version_compare('>= 0.54.0')
endif
if
get_option
(
'tests'
)
# Try to find a copy command. If this is windows we probably don't have cp,
# but if this is msys then we do, so make cp not required in that case, and
# try Xcopy if cp isn't found
prog_cp
=
find_program
(
'cp'
,
required
:
build_machine
.
system
()
!=
'windows'
)
command
=
[
'-r'
]
if
not
prog_cp
.
found
()
prog_cp
=
find_program
(
'Xcopy'
)
command
=
[
'/E'
,
'/I'
]
endif
# Copy the test resources into the build dir
run_command
(
prog_cp
,
[
command
,
meson
.
current_source_dir
()
/
'resources'
,
meson
.
current_build_dir
(),
],
)
test
(
'xmltest'
,
executable
(
...
...
@@ -89,7 +69,7 @@ if get_option('tests')
[
'xmltest.cpp'
],
link_with
:
[
lib_tinyxml2
],
),
workdir
:
meson
.
current_
build
_dir
(),
workdir
:
meson
.
current_
source
_dir
(),
)
endif
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment