From b05f1abe2ef24ed33c092b2130f183e13c6c7093 Mon Sep 17 00:00:00 2001 From: David Fugate Date: Mon, 3 Oct 2011 16:01:47 -0700 Subject: Fewer Json files (experiment...). --- tools/packaging/packager.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'tools/packaging/packager.py') diff --git a/tools/packaging/packager.py b/tools/packaging/packager.py index 3a81d7273..ef24abebb 100644 --- a/tools/packaging/packager.py +++ b/tools/packaging/packager.py @@ -148,14 +148,16 @@ def dirWalker(dirName): if temp==0: print "ERROR: expected there to be JavaScript tests under dirName!" sys.exit(1) - elif temp < MAX_CASES_PER_JSON: - TEST_SUITE_SECTIONS.append(dirName) - return - else: - #Max has been exceeded. We need to look at each subdir individually - temp = os.listdir(dirName) - for tempSubdir in temp: - dirWalker(os.path.join(dirName, tempSubdir)) + #TODO - commenting out this elif/else clause seems to be causing *.json + #naming conflicts WRT Sputnik test dirs. + # elif temp < MAX_CASES_PER_JSON: + TEST_SUITE_SECTIONS.append(dirName) + return + #TODO else: + # #Max has been exceeded. We need to look at each subdir individually + # temp = os.listdir(dirName) + # for tempSubdir in temp: + # dirWalker(os.path.join(dirName, tempSubdir)) #------------------------------------------------------------------------------ def isTestStarted(line): -- cgit v1.2.1