From 1452b20c95d698020412d0ab1ec135236e42a6bc Mon Sep 17 00:00:00 2001 From: Jondy Zhao Date: Tue, 7 Jul 2020 10:46:37 +0800 Subject: [PATCH] Refine test case for cross platform --- tests/cross-test.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tests/cross-test.sh b/tests/cross-test.sh index d1154f1b..39ca0249 100755 --- a/tests/cross-test.sh +++ b/tests/cross-test.sh @@ -143,7 +143,7 @@ check_return_value check_file_content result.log "linux/armv7/3/_pytransform.so" check_file_exists $OUTPUT/pytransform/_pytransform.so -csih_inform "Case CR-4: cross runtime with multi-platforms linux.armv7,linux.aarch32" +csih_inform "Case CR-4: cross runtime with linux.armv7,linux.aarch32" rm -rf $OUTPUT $PYARMOR runtime --platform linux.armv7,linux.aarch32 >result.log 2>&1 check_return_value @@ -152,7 +152,7 @@ check_file_content result.log "linux/aarch32/3/_pytransform.so" check_file_exists $OUTPUT/pytransform/platforms/linux/armv7/_pytransform.so check_file_exists $OUTPUT/pytransform/platforms/linux/aarch32/_pytransform.so -csih_inform "Case CR-5: cross runtime with multi-platforms linux.x86_64,darwin.x86_64,linux.aarch64" +csih_inform "Case CR-5: cross runtime with linux.x86_64,darwin.x86_64,linux.aarch64" rm -rf $OUTPUT $PYARMOR runtime --platform linux.x86_64,darwin.x86_64,linux.aarch64 >result.log 2>&1 check_return_value @@ -163,19 +163,24 @@ check_file_exists $OUTPUT/pytransform/platforms/linux/x86_64/_pytransform.so check_file_exists $OUTPUT/pytransform/platforms/darwin/x86_64/_pytransform.dylib check_file_exists $OUTPUT/pytransform/platforms/linux/aarch64/_pytransform.so -csih_inform "Case CR-6: cross runtime with multi-platforms linux.arm,windows.x86_64" +csih_inform "Case CR-6: cross runtime with linux.arm,windows.x86_64.0" rm -rf $OUTPUT -$PYARMOR runtime --platform linux.arm,windows.x86_64 >result.log 2>&1 +$PYARMOR runtime --platform linux.arm,windows.x86_64.0 >result.log 2>&1 check_return_value check_file_content result.log "linux/arm/0/_pytransform.so" check_file_content result.log "windows/x86_64/0/_pytransform.dll" check_file_exists $OUTPUT/pytransform/platforms/linux/arm/_pytransform.so check_file_exists $OUTPUT/pytransform/platforms/windows/x86_64/_pytransform.dll -csih_inform "Case CR-7: cross runtime with multi-platforms windows.x86,linux.x86_64,linux.arm" +csih_inform "Case CR-7: cross runtime with windows.x86,linux.x86_64,linux.arm" rm -rf $OUTPUT $PYARMOR runtime --platform windows.x86,linux.x86_64,linux.arm >result.log 2>&1 -check_file_content result.log "No dynamic library found for linux.arm with features" +check_file_content result.log "Multi platforms conflict, platform linux.arm" + +csih_inform "Case CR-8: cross runtime with linux.arm,windows.x86_64" +rm -rf $OUTPUT +$PYARMOR runtime --platform linux.arm,windows.x86_64 >result.log 2>&1 +check_file_content result.log "Multi platforms conflict, platform windows.x86_64.7" echo "" echo "-------------------- Test Cross Runtime END ------------------------"