LUCENE-10192: Adjust checks to the new binary file structure.

This commit is contained in:
Dawid Weiss 2021-10-30 21:33:03 +02:00
parent d23f37d02d
commit 01839da593
1 changed files with 5 additions and 7 deletions

View File

@ -574,7 +574,6 @@ def verifyUnpacked(java, artifact, unpackPath, gitRevision, version, testArgs):
# raise RuntimeError('lucene: file "%s" is missing from artifact %s' % (fileName, artifact))
# in_root_folder.remove(fileName)
# TODO: clean this up to not be a list of modules that we must maintain
expected_folders = ['analysis', 'backward-codecs', 'benchmark', 'classification', 'codecs', 'core',
'demo', 'expressions', 'facet', 'grouping', 'highlighter', 'join',
'luke', 'memory', 'misc', 'monitor', 'queries', 'queryparser', 'replicator',
@ -589,8 +588,7 @@ def verifyUnpacked(java, artifact, unpackPath, gitRevision, version, testArgs):
if len(in_lucene_folder) > 0:
raise RuntimeError('lucene: unexpected files/dirs in artifact %s lucene/ folder: %s' % (artifact, in_lucene_folder))
else:
is_in_list(in_root_folder, expected_folders)
is_in_list(in_root_folder, ['docs'])
is_in_list(in_root_folder, ['bin', 'docs', 'licenses', 'modules', 'modules-test-framework', 'modules-thirdparty'])
if len(in_root_folder) > 0:
raise RuntimeError('lucene: unexpected files/dirs in artifact %s: %s' % (artifact, in_root_folder))
@ -655,10 +653,10 @@ def testDemo(run_java, isSrc, version, jdk):
cp = sep.join(classPath)
docsDir = 'lucene/core/src'
else:
classPath = ['core/lucene-core-%s.jar' % version,
'demo/lucene-demo-%s.jar' % version,
'analysis/common/lucene-analyzers-common-%s.jar' % version,
'queryparser/lucene-queryparser-%s.jar' % version]
classPath = ['modules/lucene-core-%s.jar' % version,
'modules/lucene-demo-%s.jar' % version,
'modules/lucene-analyzers-common-%s.jar' % version,
'modules/lucene-queryparser-%s.jar' % version]
cp = sep.join(classPath)
docsDir = 'docs'
run_java('java -cp "%s" -Dsmoketester=true org.apache.lucene.demo.IndexFiles -index index -docs %s' % (cp, docsDir), 'index.log')