diff options
| author | Alexander Kurtakov | 2018-07-06 09:02:55 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2018-07-06 09:02:55 +0000 |
| commit | e0230810fd4eb4580b15f7fb6516e1e45aa43866 (patch) | |
| tree | 2201308520dbe92c8787fe77a68e357b5aee1aec | |
| parent | 0f1ab818e5e1c712656bdc15ebdffe868678a0b6 (diff) | |
| download | eclipse.platform.releng-e0230810fd4eb4580b15f7fb6516e1e45aa43866.tar.gz eclipse.platform.releng-e0230810fd4eb4580b15f7fb6516e1e45aa43866.tar.xz eclipse.platform.releng-e0230810fd4eb4580b15f7fb6516e1e45aa43866.zip | |
Bug 536173 - Test testFeatureFiles failing about missing feature files
Add logic to accept EPL 1.0 features for EMF and ECF as they haven't
moved to EPL 2.0 yet.
Change-Id: I5475699b3bcec3a5af6ca9d05a5e1e5ebcc33f70
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
| -rw-r--r-- | bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/BuildTests.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/BuildTests.java b/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/BuildTests.java index 11766318..f1b708aa 100644 --- a/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/BuildTests.java +++ b/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/BuildTests.java @@ -323,8 +323,10 @@ public class BuildTests { } - public static final List<String> REQUIRED_FEATURE_FILES = Arrays + public static final List<String> REQUIRED_FEATURE_FILES_EPL2 = Arrays .asList(new String[] { "epl-2.0.html", "feature.properties", "feature.xml", "license.html" }); + public static final List<String> REQUIRED_FEATURE_FILES_EPL1 = Arrays + .asList(new String[] { "epl-v10.html", "feature.properties", "feature.xml", "license.html" }); public static final String REQUIRED_FEATURE_SUFFIX = ""; public static final List<String> REQUIRED_PLUGIN_FILES = Arrays @@ -379,7 +381,12 @@ public class BuildTests { File featureDir = new File(installDir, "features"); for (File aFeature : featureDir.listFiles()) { - if (!testDirectory(aFeature, REQUIRED_FEATURE_FILES, REQUIRED_FEATURE_SUFFIX)) { + List<String> testFiles = REQUIRED_FEATURE_FILES_EPL2; + // EMF and ECF features are still EPL 1.0 + if (aFeature.getName().startsWith("org.eclipse.ecf") || aFeature.getName().startsWith("org.eclipse.emf")) { + testFiles = REQUIRED_FEATURE_FILES_EPL1; + } + if (!testDirectory(aFeature, testFiles, REQUIRED_FEATURE_SUFFIX)) { result.add(aFeature.getPath()); } } |