liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

more test work

Browse Source
This commit is contained in:
John Smith
2022-11-30 09:39:12 -05:00
parent 672d750f8f
commit b47b5c1e85
65 changed files with 44 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
veilid-core/src/intf/native/mod.rs
View File

@@ -10,6 +10,6 @@ pub use table_store::*;
#[cfg(target_os = "android")]
pub mod android;
#[cfg(all(target_os = "ios", feature = "ios_tests"))]
#[cfg(all(target_os = "ios", feature = "veilid_core_ios_tests"))]
pub mod ios_test_setup;
pub mod network_interfaces;

2
veilid-core/src/lib.rs
View File

@@ -1,6 +1,6 @@
#![deny(clippy::all)]
#![deny(unused_must_use)]
#![recursion_limit = "1024"]
#![recursion_limit = "256"]
cfg_if::cfg_if! {
if #[cfg(target_arch = "wasm32")] {

4
veilid-core/src/tests/android/app/build.gradle
View File

@@ -7,7 +7,7 @@ android {
buildToolsVersion "30.0.3"
defaultConfig {
applicationId "com.veilid.veilidcore.veilidcore_android_tests"
applicationId "com.veilid.veilid_core_android_tests"
minSdkVersion 24
targetSdkVersion 30
versionCode 1
@@ -69,7 +69,7 @@ cargo {
profile = gradle.startParameter.taskNames.any{it.toLowerCase().contains("debug")} ? "debug" : "release"
pythonCommand = "python3"
features {
defaultAnd("android_tests", "rt-tokio")
defaultAnd("veilid_core_android_tests", "rt-tokio")
}
}

2
veilid-core/src/tests/android/app/src/main/AndroidManifest.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.veilid.veilidcore.veilidcore_android_tests">
package="com.veilid.veilid_core_android_tests">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

2
veilid-core/src/tests/android/app/src/main/java/com/veilid/veilid-core/veilid-core_android_tests/MainActivity.java
View File

@@ -1,4 +1,4 @@
package com.veilid.veilidcore.veilidcore_android_tests;
package com.veilid.veilid_core_android_tests;
import androidx.appcompat.app.AppCompatActivity;
import android.content.Context;

2
veilid-core/src/tests/android/remove_from_all_devices.sh
View File

@@ -1,3 +1,3 @@
#!/bin/bash
./adb+.sh uninstall com.veilid.veilidcore.veilidcore_android_tests
./adb+.sh uninstall com.veilid.veilid_core_android_tests

16
veilid-core/src/tests/ios/veilidcore-tests/veilidcore-tests.xcodeproj/project.pbxproj
View File

@@ -167,7 +167,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "../../../../ios_build.sh --features ios_tests\n";
shellScript = "../../../../../scripts/ios_build.sh ../../../../ veilid_core --features veilid_core_ios_tests,rt-tokio\n";
};
/* End PBXShellScriptBuildPhase section */
@@ -209,7 +209,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = arm64;
ARCHS = "$(ARCHS_STANDARD)";
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -264,6 +264,7 @@
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
@@ -271,7 +272,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = arm64;
ARCHS = "$(ARCHS_STANDARD)";
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -319,6 +320,7 @@
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
name = Release;
@@ -339,11 +341,11 @@
);
OTHER_LDFLAGS = "";
"OTHER_LDFLAGS[sdk=iphoneos*]" = (
"-L../../../../../target/aarch64-apple-ios/debug",
"-L../../../../../target/lipo-ios/debug",
"-lveilid_core",
);
"OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
"-L../../../../../target/x86_64-apple-ios/debug",
"-L../../../../../target/lipo-ios-sim/debug",
"-lveilid_core",
);
PRODUCT_BUNDLE_IDENTIFIER = "com.veilid.veilidcore-tests";
@@ -371,11 +373,11 @@
);
OTHER_LDFLAGS = "";
"OTHER_LDFLAGS[sdk=iphoneos*]" = (
"-L../../../../../target/aarch64-apple-ios/release",
"-L../../../../../target/lipo-ios/release",
"-lveilid_core",
);
"OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
"-L../../../../../target/x86_64-apple-ios/release",
"-L../../../../../target/lipo-ios-sim/release",
"-lveilid_core",
);
PRODUCT_BUNDLE_IDENTIFIER = "com.veilid.veilidcore-tests";

8
veilid-core/src/tests/native/mod.rs
View File

@@ -5,13 +5,13 @@ use crate::network_manager::tests::*;
use crate::tests::common::*;
use crate::*;
#[cfg(all(target_os = "android", feature = "android_tests"))]
#[cfg(all(target_os = "android", feature = "veilid_core_android_tests"))]
use jni::{objects::JClass, objects::JObject, JNIEnv};
#[cfg(all(target_os = "android", feature = "android_tests"))]
#[cfg(all(target_os = "android", feature = "veilid_core_android_tests"))]
#[no_mangle]
#[allow(non_snake_case)]
pub extern "system" fn Java_com_veilid_veilidcore_veilidcore_1android_1tests_MainActivity_run_1tests(
pub extern "system" fn Java_com_veilid_veilid_1core_1android_1tests_MainActivity_run_1tests(
env: JNIEnv,
_class: JClass,
ctx: JObject,
@@ -25,7 +25,7 @@ pub extern "system" fn Java_com_veilid_veilidcore_veilidcore_1android_1tests_Mai
run_all_tests();
}
#[cfg(all(target_os = "ios", feature = "ios_tests"))]
#[cfg(all(target_os = "ios", feature = "veilid_core_ios_tests"))]
#[no_mangle]
pub extern "C" fn run_veilid_core_tests() {
let log_path: std::path::PathBuf = [