Changeset 7377:271a414099ce in orange


Ignore:
Timestamp:
02/04/11 01:24:01 (3 years ago)
Author:
blaz <blaz.zupan@…>
Branch:
default
Convert:
77090c9eef171ba7d07b475bc8613d8ae906b416
Message:

testing for orange25, explicit naming of directories

File:
1 edited

Legend:

Unmodified
Added
Removed
  • testing/regressionTests/xtest.py

    r7352 r7377  
    3131    caller_directory = os.getcwd() 
    3232    os.chdir(root_directory) # directory to start the testing in 
    33     for dir in os.listdir("."): 
    34         if not os.path.isdir(dir) or dir in [".svn", "cvs", "datasets", "widgets", "processed", "catalog"] or (directories and not dir in directories): 
    35             continue 
    36          
     33    for dirname, dir in directories: 
    3734        os.chdir(dir) 
    38         outputsdir = "%s/results/%s/%s" % (regtestdir, module, dir) 
    39         print "DIR", dir 
     35        if module <> dirname: 
     36            outputsdir = "%s/results/%s/%s" % (regtestdir, module, dirname) 
     37        else: 
     38            outputsdir = "%s/results/%s" % (regtestdir, module) 
     39             
     40        print "DIR %s (%s)" % (dirname, dir) 
    4041        if not os.path.exists(outputsdir): 
    4142            os.mkdir(outputsdir) 
     
    151152 
    152153    try: 
    153         opts, test_files = getopt.getopt(argv, "hs", ["single", "module=", "help", "dir=", "files=", "verbose="]) 
     154        opts, test_files = getopt.getopt(argv, "hs", ["single", "module=", "help", "files=", "verbose="]) 
    154155    except getopt.GetoptError: 
    155156        print "Warning: Wrong argument" 
     
    162163        usage() 
    163164        sys.exit(0) 
    164     directories = []  
    165     if "--dir" in opts: 
    166         directories = opts["--dir"].split(",") 
    167165     
    168166    module = opts.get("--module", "orange") 
    169     if module in ["orange", "orng"]: 
     167    if module in ["orange"]: 
    170168        root = "%s/doc" % orngEnviron.orangeDir 
    171169        module = "orange" 
     170        dirs = [("modules", "modules"), ("reference", "reference"), ("ofb", "ofb-rst/code")] 
     171    elif module in ["orange25"]: 
     172        root = "%s/doc" % orngEnviron.orangeDir 
     173        module = "orange25" 
     174        dirs = [("orange25", "Orange/rst/code")] 
    172175    elif module == "obi": 
    173176        root = orngEnviron.addOnsDirSys + "/Bioinformatics/doc" 
     
    179182     
    180183    test_scripts(command=="test", command=="report" or (command=="report-html" and command or False),  
    181                  module=module, root_directory=root,  
    182                  test_files=test_files, directories=directories) 
     184                 module=module, root_directory=root, 
     185                 test_files=test_files, directories=dirs) 
    183186    # sys.exit(error_status) 
    184187     
Note: See TracChangeset for help on using the changeset viewer.