summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Daniel2013-10-14 07:56:10 (EDT)
committerGerrit Code Review @ Eclipse.org2013-10-29 09:09:05 (EDT)
commitbf4c2fd873b52965823e77a086623538eb2669ec (patch)
treea05c0b5ef670067817ffce5438d3b7a789cc463a
parentccfb538b16d8c043cc95887026c636a785c792fe (diff)
downloadrt.equinox.p2-bf4c2fd873b52965823e77a086623538eb2669ec.zip
rt.equinox.p2-bf4c2fd873b52965823e77a086623538eb2669ec.tar.gz
rt.equinox.p2-bf4c2fd873b52965823e77a086623538eb2669ec.tar.bz2
Bug 416565 - p2 shared install test failuresrefs/changes/52/17352/4
This commit rebuilds internal test repository containing verifier application, and makes further rebuilds easier by providing complete sources of a repository projects that can be build immediately after checkout. Change-Id: Iea19e78024ec65dfe24c4e7e21932b016531f3b9 Signed-off-by: Krzysztof Daniel <kdaniel@redhat.com>
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/README.txt18
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/artifacts.jarbin663 -> 654 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/content.jarbin1477 -> 1553 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201309272034.jarbin423 -> 0 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201310141350.jarbin0 -> 421 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201309272034.jarbin407 -> 0 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201310141350.jarbin0 -> 402 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201309272034.jarbin408 -> 0 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201310141350.jarbin0 -> 401 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.1.0.201309272034.jarbin35553 -> 0 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.1.0.201310141350.jarbin0 -> 41868 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201309272034.jarbin394 -> 0 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201310141350.jarbin0 -> 535 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201309272034.jarbin393 -> 0 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201310141350.jarbin0 -> 534 bytes
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/readme.txt5
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/Verifier/.project17
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/Verifier/build.properties1
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/Verifier/feature.xml26
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/p2TestBundle1/src/directoryplaceholder.txt0
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/p2TestBundle2/src/directoryplaceholder.txt0
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/.gitignore4
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/.project17
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/site.xml6
24 files changed, 90 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/README.txt b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/README.txt
new file mode 100644
index 0000000..ea78a36
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/README.txt
@@ -0,0 +1,18 @@
+Running sharedinstall tests requires an application ("Verifier")
+that is installed in the independent Eclipse-like installation. The Verifier
+checks if certain P2 operations in a shared install scenario ends with success
+(f.e. it checks whether certain bundles are installed).
+
+* REALLY IMPORTANT NOTE *
+The Verifier is not built during compile time or testing time. It needs to be built
+manually after each modification and be made available in a test repository located
+in bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo.
+
+The steps to build the Verifier (and other bundles from that test repo are):
+1. Import projects from the repo source subtree bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source
+ There is 6 subprojects there (2 test bundles, 2 test features, Verifier feature and an update site).
+2. Open site.xml located in a site project, and press 'Build All'.
+3. Eclipse will generate a p2 repository (directories "features" and "plugins",
+ and jars "artifacts.jar" and "content.jar").
+4. Remove old content from bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo,
+ copy new content there, and commit to repository. \ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/artifacts.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/artifacts.jar
index e4c6ba9..711c98b 100644
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/artifacts.jar
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/artifacts.jar
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/content.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/content.jar
index c4f2050..36decf2 100644
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/content.jar
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/content.jar
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201309272034.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201309272034.jar
deleted file mode 100644
index 186ac61..0000000
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201309272034.jar
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201310141350.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201310141350.jar
new file mode 100644
index 0000000..b55d00b
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201310141350.jar
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201309272034.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201309272034.jar
deleted file mode 100644
index 35d3aad..0000000
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201309272034.jar
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201310141350.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201310141350.jar
new file mode 100644
index 0000000..08f32af
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201310141350.jar
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201309272034.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201309272034.jar
deleted file mode 100644
index 243b7fb..0000000
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201309272034.jar
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201310141350.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201310141350.jar
new file mode 100644
index 0000000..a3adfb6
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201310141350.jar
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.1.0.201309272034.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.1.0.201309272034.jar
deleted file mode 100644
index 0dab386..0000000
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.1.0.201309272034.jar
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.1.0.201310141350.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.1.0.201310141350.jar
new file mode 100644
index 0000000..b1b19ee
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.1.0.201310141350.jar
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201309272034.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201309272034.jar
deleted file mode 100644
index f6bf4dc..0000000
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201309272034.jar
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201310141350.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201310141350.jar
new file mode 100644
index 0000000..a869298
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201310141350.jar
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201309272034.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201309272034.jar
deleted file mode 100644
index a4ac9a6..0000000
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201309272034.jar
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201310141350.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201310141350.jar
new file mode 100644
index 0000000..ae9c676
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201310141350.jar
Binary files differ
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/readme.txt b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/readme.txt
index 2372551..aa70f28 100644
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/readme.txt
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/readme.txt
@@ -2,4 +2,7 @@ This repository is used by the SharedInstallEnd2End test.
It contains two dummy bundles installable by two dummy features. Those are just used to install content into the base or the user install.
It also contains the code of the p2 verifier bundle wrapped by a feature to make it easily installable.
-The source code is available in the folder called source sibling of the folder containing this file. \ No newline at end of file
+The source code is available in the folder called source sibling of the folder containing this file.
+
+Detailed instructions how to build the repository are located next to the test source,
+in a README.txt file located in bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/. \ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/Verifier/.project b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/Verifier/.project
new file mode 100644
index 0000000..e2ad032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/Verifier/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>verifier_feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/Verifier/build.properties b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/Verifier/build.properties
new file mode 100644
index 0000000..64f93a9
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/Verifier/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/Verifier/feature.xml b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/Verifier/feature.xml
new file mode 100644
index 0000000..fc4308d
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/Verifier/feature.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="Verifier"
+ label="Verifier feature"
+ version="1.0.0.qualifier">
+
+ <description url="http://www.example.com/description">
+ [Enter Feature Description here.]
+ </description>
+
+ <copyright url="http://www.example.com/copyright">
+ [Enter Copyright Description here.]
+ </copyright>
+
+ <license url="http://www.example.com/license">
+ [Enter License Description here.]
+ </license>
+
+ <plugin
+ id="org.eclipse.equinox.p2.tests.verifier"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/p2TestBundle1/src/directoryplaceholder.txt b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/p2TestBundle1/src/directoryplaceholder.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/p2TestBundle1/src/directoryplaceholder.txt
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/p2TestBundle2/src/directoryplaceholder.txt b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/p2TestBundle2/src/directoryplaceholder.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/p2TestBundle2/src/directoryplaceholder.txt
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/.gitignore b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/.gitignore
new file mode 100644
index 0000000..bb8f6dc
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/.gitignore
@@ -0,0 +1,4 @@
+features
+plugins
+artifacts.jar
+content.jar
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/.project b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/.project
new file mode 100644
index 0000000..4386b92
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>site</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.UpdateSiteBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.UpdateSiteNature</nature>
+ </natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/site.xml b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/site.xml
index 0befa62..41c9667 100644
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/site.xml
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/site.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/Verifier_1.0.0.201304051618.jar" id="Verifier" version="1.0.0.201304051618">
+ <feature url="features/Verifier_0.0.0.jar" id="Verifier" version="0.0.0">
<category name="c1"/>
</feature>
- <feature url="features/p2TestFeature1_1.0.0.201304051618.jar" id="p2TestFeature1" version="1.0.0.201304051618">
+ <feature url="features/p2TestFeature1_0.0.0.jar" id="p2TestFeature1" version="0.0.0">
<category name="c1"/>
</feature>
- <feature url="features/p2TestFeature2_1.0.0.201304051618.jar" id="p2TestFeature2" version="1.0.0.201304051618">
+ <feature url="features/p2TestFeature2_0.0.0.jar" id="p2TestFeature2" version="0.0.0">
<category name="c1"/>
</feature>
<category-def name="c1" label="c1"/>