- properly indent 'unpack ...' message at the top of unpack() (was indented one too many levels)

- SOLR-3884: When testing the Solr example with the binary Solr distributions (.tgz and .zip), start with a clean copy of the unpacked distribution for each JVM to be tested with
(merge branch lucene_solr_4_0 r1390046)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1390055 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steven Rowe 2012-09-25 19:09:58 +00:00
parent 62caa1d692
commit 07045a77df
1 changed files with 17 additions and 3 deletions

View File

@ -403,7 +403,7 @@ def unpack(project, tmpDir, artifact, version):
shutil.rmtree(destDir)
os.makedirs(destDir)
os.chdir(destDir)
print(' unpack %s...' % artifact)
print(' unpack %s...' % artifact)
unpackLogFile = '%s/%s-unpack-%s.log' % (tmpDir, project, artifact)
if artifact.endswith('.tar.gz') or artifact.endswith('.tgz'):
run('tar xzf %s/%s' % (tmpDir, artifact), unpackLogFile)
@ -532,11 +532,25 @@ def verifyUnpacked(project, artifact, unpackPath, version, tmpDir):
if project == 'lucene':
testDemo(isSrc, version)
else:
print(' copying unpacked distribution for Java 6 ...')
java6UnpackPath = '%s-java6' %unpackPath
if os.path.exists(java6UnpackPath):
shutil.rmtree(java6UnpackPath)
shutil.copytree(unpackPath, java6UnpackPath)
os.chdir(java6UnpackPath)
print(' test solr example w/ Java 6...')
testSolrExample(unpackPath, JAVA6_HOME, False)
testSolrExample(java6UnpackPath, JAVA6_HOME, False)
print(' copying unpacked distribution for Java 7 ...')
java7UnpackPath = '%s-java7' %unpackPath
if os.path.exists(java7UnpackPath):
shutil.rmtree(java7UnpackPath)
shutil.copytree(unpackPath, java7UnpackPath)
os.chdir(java7UnpackPath)
print(' test solr example w/ Java 7...')
testSolrExample(unpackPath, JAVA7_HOME, False)
testSolrExample(java7UnpackPath, JAVA7_HOME, False)
os.chdir(unpackPath)
testChangesText('.', version, project)