svn commit: r1390053 - in /lucene/dev/branches/branch_4x: ./ dev-tools/ dev-tools/scripts/smokeTestRelease.py lucene/ solr/

[sa...@apache.org]

Author: sarowe
Date: Tue Sep 25 19:03:32 2012
New Revision: 1390053

URL: http://svn.apache.org/viewvc?rev=1390053&view=rev
Log:
- properly indent 'unpack ...' message at the top of unpack()  (was indented one too many levels)
- 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)

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)

Modified: lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py?rev=1390053&r1=1390052&r2=1390053&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/branches/branch_4x/dev-tools/scripts/smokeTestRelease.py Tue Sep 25 19:03:32 2012
@@ -403,7 +403,7 @@ def unpack(project, tmpDir, artifact, ve
     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, un
     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)