fix android unit tests and add better macos instructions
This commit is contained in:
		
							
								
								
									
										3
									
								
								veilid-core/src/tests/android/.idea/gradle.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										3
									
								
								veilid-core/src/tests/android/.idea/gradle.xml
									
									
									
										generated
									
									
									
								
							@@ -8,14 +8,13 @@
 | 
			
		||||
        <option name="disableWrapperSourceDistributionNotification" value="true" />
 | 
			
		||||
        <option name="distributionType" value="DEFAULT_WRAPPED" />
 | 
			
		||||
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
 | 
			
		||||
        <option name="gradleJvm" value="1.8" />
 | 
			
		||||
        <option name="gradleJvm" value="Embedded JDK" />
 | 
			
		||||
        <option name="modules">
 | 
			
		||||
          <set>
 | 
			
		||||
            <option value="$PROJECT_DIR$" />
 | 
			
		||||
            <option value="$PROJECT_DIR$/app" />
 | 
			
		||||
          </set>
 | 
			
		||||
        </option>
 | 
			
		||||
        <option name="resolveModulePerSourceSet" value="false" />
 | 
			
		||||
      </GradleProjectSettings>
 | 
			
		||||
    </option>
 | 
			
		||||
  </component>
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								veilid-core/src/tests/android/.idea/misc.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										2
									
								
								veilid-core/src/tests/android/.idea/misc.xml
									
									
									
										generated
									
									
									
								
							@@ -1,6 +1,6 @@
 | 
			
		||||
<?xml version="1.0" encoding="UTF-8"?>
 | 
			
		||||
<project version="4">
 | 
			
		||||
  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
 | 
			
		||||
  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
 | 
			
		||||
    <output url="file://$PROJECT_DIR$/build/classes" />
 | 
			
		||||
  </component>
 | 
			
		||||
  <component name="ProjectType">
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										20
									
								
								veilid-core/src/tests/android/adb+.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										20
									
								
								veilid-core/src/tests/android/adb+.sh
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,20 @@
 | 
			
		||||
#!/bin/bash
 | 
			
		||||
# Script adb+
 | 
			
		||||
# Usage
 | 
			
		||||
# You can run any command adb provide on all your current devices
 | 
			
		||||
# ./adb+ <command> is the equivalent of ./adb -s <serial number> <command>
 | 
			
		||||
#
 | 
			
		||||
# Examples
 | 
			
		||||
# ./adb+ version
 | 
			
		||||
# ./adb+ install apidemo.apk
 | 
			
		||||
# ./adb+ uninstall com.example.android.apis
 | 
			
		||||
 | 
			
		||||
adb devices | while read line
 | 
			
		||||
do
 | 
			
		||||
    if [ ! "$line" = "" ] && [ `echo $line | awk '{print $2}'` = "device" ]
 | 
			
		||||
    then
 | 
			
		||||
        device=`echo $line | awk '{print $1}'`
 | 
			
		||||
        echo "$device $@ ..."
 | 
			
		||||
        adb -s $device $@
 | 
			
		||||
    fi
 | 
			
		||||
done
 | 
			
		||||
@@ -67,6 +67,7 @@ cargo {
 | 
			
		||||
    targetDirectory = "../../../../../target"
 | 
			
		||||
    prebuiltToolchains = true
 | 
			
		||||
    profile = gradle.startParameter.taskNames.any{it.toLowerCase().contains("debug")} ? "debug" : "release"
 | 
			
		||||
    pythonCommand = "python3"
 | 
			
		||||
    features {
 | 
			
		||||
        defaultAnd("android_tests", "rt-tokio")
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								veilid-core/src/tests/android/install_on_all_devices.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										2
									
								
								veilid-core/src/tests/android/install_on_all_devices.sh
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,2 @@
 | 
			
		||||
#!/bin/bash
 | 
			
		||||
./gradlew installDebug
 | 
			
		||||
							
								
								
									
										3
									
								
								veilid-core/src/tests/android/remove_from_all_devices.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										3
									
								
								veilid-core/src/tests/android/remove_from_all_devices.sh
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,3 @@
 | 
			
		||||
#!/bin/bash
 | 
			
		||||
./adb+.sh uninstall com.veilid.veilidcore.veilidcore_android_tests
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user