Update module test to pass w/o freestyle enabled

This commit is contained in:
Campbell Barton 2015-09-23 03:34:37 +10:00
parent 7615073e77
commit 0cf842a989
1 changed files with 9 additions and 2 deletions

View File

@ -38,6 +38,9 @@ BLACKLIST = {
'io_import_dxf', # Because of cydxfentity.so dependency
}
if not bpy.app.build_options.freestyle:
BLACKLIST.add("render_freestyle_svg")
BLACKLIST_DIRS = (
os.path.join(bpy.utils.resource_path('USER'), "scripts"),
) + tuple(addon_utils.paths()[1:])
@ -75,8 +78,11 @@ def load_addons():
for mod in modules:
mod_name = mod.__name__
if mod_name in BLACKLIST:
continue
addon_utils.enable(mod_name, default_set=True)
assert(mod_name in addons)
if not (mod_name in addons):
raise Exception("'addon_utils.enable(%r)' call failed" % mod_name)
def load_modules():
@ -157,7 +163,8 @@ def load_modules():
ignore_paths = [
os.sep + "presets" + os.sep,
os.sep + "templates" + os.sep,
] + [(os.sep + f + os.sep) for f in BLACKLIST]
] + ([(os.sep + f + os.sep) for f in BLACKLIST] +
[(os.sep + f + ".py") for f in BLACKLIST])
for f in source_files:
ok = False