You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/09/07 00:45:53 UTC
svn commit: r1381790 -
/lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py
Author: rmuir
Date: Thu Sep 6 22:45:52 2012
New Revision: 1381790
URL: http://svn.apache.org/viewvc?rev=1381790&view=rev
Log:
fix smoketester
Modified:
lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py
Modified: lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py?rev=1381790&r1=1381789&r2=1381790&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py Thu Sep 6 22:45:52 2012
@@ -486,13 +486,14 @@ def verifyUnpacked(project, artifact, un
run('%s; ant javadocs' % javaExe('1.6'), '%s/javadocs.log' % unpackPath)
checkJavadocpath('%s/build/docs' % unpackPath)
else:
+ os.chdir('solr')
print(' run tests w/ Java 6...')
run('%s; ant test' % javaExe('1.6'), '%s/test.log' % unpackPath)
# test javadocs
print(' generate javadocs w/ Java 6...')
run('%s; ant javadocs' % javaExe('1.6'), '%s/javadocs.log' % unpackPath)
- checkJavadocpath('%s/build/docs' % unpackPath)
+ checkJavadocpath('%s/solr/build/docs' % unpackPath, False)
print(' run tests w/ Java 7...')
run('%s; ant test' % javaExe('1.7'), '%s/test.log' % unpackPath)
@@ -500,9 +501,8 @@ def verifyUnpacked(project, artifact, un
# test javadocs
print(' generate javadocs w/ Java 7...')
run('%s; ant javadocs' % javaExe('1.7'), '%s/javadocs.log' % unpackPath)
- checkJavadocpath('%s/build/docs' % unpackPath)
+ checkJavadocpath('%s/solr/build/docs' % unpackPath, False)
- os.chdir('solr')
print(' test solr example w/ Java 6...')
run('%s; ant clean example' % javaExe('1.6'), '%s/antexample.log' % unpackPath)
testSolrExample(unpackPath, JAVA6_HOME, True)
@@ -620,10 +620,10 @@ def testSolrExample(unpackPath, javaPath
os.chdir('..')
-def checkJavadocpath(path):
+def checkJavadocpath(path, failOnMissing=True):
# check for level='package'
# we fail here if its screwed up
- if checkJavaDocs.checkPackageSummaries(path, 'package'):
+ if failOnMissing and checkJavaDocs.checkPackageSummaries(path, 'package'):
raise RuntimeError('missing javadocs package summaries!')
# now check for level='class'