diff options
author | Lee Thomason <leethomason@gmail.com> | 2022-04-02 23:53:09 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-02 23:53:09 +0300 |
commit | 435c0a119917cdf4a6fa7e510ec225860d7d2b3c (patch) | |
tree | 2400464f2b769330d743d5b1dc36f173ad480b98 | |
parent | 34dd03ecc24602632589024e9ddd2865e38b84e3 (diff) | |
parent | f6c991658bf1afda36d0f56926757d8b5d043a8f (diff) |
Merge pull request #893 from eli-schwartz/meson-test-cleanup
meson: simplify test setup
-rw-r--r-- | meson.build | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/meson.build b/meson.build index 3546c15..91f228b 100644 --- a/meson.build +++ b/meson.build @@ -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 |