summaryrefslogtreecommitdiffstats
path: root/prepRuntimeLocation.sh
diff options
context:
space:
mode:
Diffstat (limited to 'prepRuntimeLocation.sh')
-rwxr-xr-xprepRuntimeLocation.sh21
1 files changed, 19 insertions, 2 deletions
diff --git a/prepRuntimeLocation.sh b/prepRuntimeLocation.sh
index 7e88643..ce3ee86 100755
--- a/prepRuntimeLocation.sh
+++ b/prepRuntimeLocation.sh
@@ -8,7 +8,10 @@ cp -rp /usr/share/java/eclipse-testing/* ./
# Remove eclipse-tests p2 repo and generate for system
rm -rf features plugins content.jar artifacts.jar binary
-/usr/share/java/tycho/copy-platform-all $(pwd)
+
+# Create directory of all system OSGi bundles
+# Do not create into p2 repo yet (we must make test bundles have dir shape)
+../gatherBundles.sh $(pwd)
popd
@@ -30,6 +33,21 @@ sed -i '/<antcall target="quickTests" \/>/ d' target/test.xml
sed -i '/<antcall target="longRunningTests" \/>/ d' target/test.xml
sed -i '/<target name="all">/ a <antcall target="linuxtoolsTests" \/>' target/test.xml
+# A VERY dirty hack to mimic Tycho's improper usage of test bundle resources
+sed -i '/<antcall target="configureTeamTest" \/>/ i \
+<path id="testbundle.paths"> \
+ <dirset \
+ dir="\${eclipse-home}" \
+ includes="plugins/\${testPlugin}_*" \/> \
+<\/path> \
+<property \
+ name="testBundlePath" \
+ refid="testbundle.paths" \/> \
+<copy todir="\${eclipse-home}"> \
+ <fileset dir="\${testBundlePath}" includes="**" \/> \
+</copy>' target/test.xml
+
+
# Define our test task
sed -i '/<target name="quickTests">/ i \
<target name="linuxtoolsTests"> \
@@ -47,7 +65,6 @@ sed -i '/<target name="quickTests">/ i \
sed -i 's/"-installIUs \(.*\)"/"-installIUs \1,org.eclipse.swtbot.eclipse.junit.headless"/' target/test.xml
# Prepare the runtests.sh file
-
sed -i '/cp \${testslocation}\/\*\.properties/ a cp \${testslocation}\/{JUNIT.XSL,alltest.xml,updateTestBundleXML.sh,swtbot-library.xml} \.' target/runtests.sh
sed -i '/^properties=/ a testslocation=\$(pwd)' target/runtests.sh