From 227ad20f6bf10d5d28073dfbd3fac363e3a09531 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 10 Mar 2012 03:31:01 +0100
Subject: android remote adb test fixes: (1) Add connect; (2) Remove overriding
 explicit BOOTCLASSPATH, use default.

(2) Android 4.0.3 LEB 12.02 / Pandaboard requires the original BOOTCLASSPATH,
    otherwise dependencies are broken and dalvikvm crashes.

    Adding 'our' ant-junit-all.apk to 'complete' the set of our required junit/ant classes
    seems to work well on V. 2.3.6 (Samsung Galaxy S) and V. 4.0.3.
---
 make/build-test.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'make')

diff --git a/make/build-test.xml b/make/build-test.xml
index e52ad4a..3435877 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -301,7 +301,8 @@ rsync -rtv --delete --delete-after --delete-excluded \${line.separator}
 mkdir ${env.TARGET_ROOT}/tmp ${line.separator}
 cd ${env.TARGET_ROOT}/${gluegen.basename}/${env.NODE_LABEL}/make ${line.separator}
 export ${system.env.library.path}=/system/lib:${env.TARGET_ROOT}/${gluegen.basename}/${env.NODE_LABEL}/${rootrel.build}/obj:${env.TARGET_ROOT}/${gluegen.basename}/${env.NODE_LABEL}/${rootrel.build}/test/build/natives ${line.separator}
-export BOOTCLASSPATH=/system/framework/core.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar ${line.separator}
+# export BOOTCLASSPATH=/system/framework/core.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar ${line.separator}
+# export BOOTCLASSPATH=/system/framework/core.jar:/system/framework/core-junit.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/apache-xml.jar:/system/framework/filterfw.jar ${line.separator}
 " append="true" file="${build_t}/targetcommand.sh" />
 
         <for param="test.class.path.m" keepgoing="true">
@@ -354,6 +355,7 @@ chmod 644 ${results}/* \${line.separator}
         <exec dir="." executable="sh" logError="true" failonerror="true" failifexecutionfails="true">
             <arg line='-x -c "
             chmod 0755 ${build_t}/targetcommand.sh ;
+            adb connect ${env.TARGET_IP}:${env.TARGET_ADB_PORT} ;
             adb -s ${env.TARGET_IP}:${env.TARGET_ADB_PORT} push ${build_t}/targetcommand.sh ${env.TARGET_ROOT}/gluegen-targetcommand.sh ;
             adb -s ${env.TARGET_IP}:${env.TARGET_ADB_PORT} shell su -c ${env.TARGET_ROOT}/gluegen-targetcommand.sh ;
             adb -s ${env.TARGET_IP}:${env.TARGET_ADB_PORT} pull ${env.TARGET_ROOT}/${gluegen.basename}/${env.NODE_LABEL}/make/${results}/ ${results}/ "'/>
-- 
cgit v1.2.3