ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make 'xb test' also run xenia-base-tests.

This commit is contained in:
gibbed 2020-02-28 14:09:50 -06:00 committed by Rick Gibbed
parent f0eb272acc
commit 2393381cff
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -38,7 +38,7 @@ configuration:
- Checked - Checked
build_script: build_script:
- cmd: xb build --config=%CONFIGURATION% --target=src\xenia-app --target=tests\xenia-cpu-ppc-tests --target=src\xenia-vfs-dump - cmd: xb build --config=%CONFIGURATION% --target=src\xenia-app --target=tests\xenia-base-tests --target=tests\xenia-cpu-ppc-tests --target=src\xenia-vfs-dump
after_build: after_build:
- cmd: | - cmd: |

15
xenia-build
View File

@ -880,7 +880,8 @@ class TestCommand(BaseBuildCommand):
# The test executables that will be built and run. # The test executables that will be built and run.
test_targets = args['target'] or [ test_targets = args['target'] or [
'xenia-cpu-ppc-tests', 'xenia-base-tests',
'xenia-cpu-ppc-tests'
] ]
args['target'] = test_targets args['target'] = test_targets
@ -895,9 +896,9 @@ class TestCommand(BaseBuildCommand):
test_executables = [ test_executables = [
get_bin(os.path.join(get_build_bin_path(args), test_target)) get_bin(os.path.join(get_build_bin_path(args), test_target))
for test_target in test_targets] for test_target in test_targets]
for test_executable in test_executables: for i in range(0, len(test_targets)):
if not has_bin(test_executable): if test_executables[i] is None:
print('ERROR: Unable to find %s - build it.' % (test_executable)) print('ERROR: Unable to find %s - build it.' % (test_targets[i]))
return 1 return 1
# Run tests. # Run tests.
@ -1063,9 +1064,9 @@ class GpuTestCommand(BaseBuildCommand):
test_executables = [ test_executables = [
get_bin(os.path.join(get_build_bin_path(args), test_target)) get_bin(os.path.join(get_build_bin_path(args), test_target))
for test_target in test_targets] for test_target in test_targets]
for test_executable in test_executables: for i in range(0, len(test_targets)):
if not has_bin(test_executable): if test_executables[i] is None:
print('ERROR: Unable to find %s - build it.' % (test_executable)) print('ERROR: Unable to find %s - build it.' % (test_targets[i]))
return 1 return 1
output_path = os.path.join(self_path, 'build', 'gputest') output_path = os.path.join(self_path, 'build', 'gputest')