diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-09-25 19:23:24 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-09-25 19:23:24 -0700 |
| commit | 17f9fd5f9653077b6059b34147a447310a30daec (patch) | |
| tree | 982329539eea03fa0e80b4107b566f584182ca24 /indra/lib/python | |
| parent | ec52e19dd16908acd72b78720880391a74ee8886 (diff) | |
Changes force no crt manifest linking in windows plugin files.
Diffstat (limited to 'indra/lib/python')
| -rw-r--r-- | indra/lib/python/indra/util/test_win32_manifest.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/lib/python/indra/util/test_win32_manifest.py b/indra/lib/python/indra/util/test_win32_manifest.py index 460e5fd487..75473ff55f 100644 --- a/indra/lib/python/indra/util/test_win32_manifest.py +++ b/indra/lib/python/indra/util/test_win32_manifest.py @@ -78,7 +78,10 @@ def test_assembly_binding(src_filename, assembly_name, assembly_ver): resource_id = ";#2" system_call = '%s -nologo -inputresource:%s%s -out:%s' % (mt_path, src_filename, resource_id, tmp_file_name) print "Executing: %s" % system_call - os.system(system_call) + mt_result = os.system(system_call) + if mt_result == 31: + print "No manifest found in %s" % src_filename + raise Exception("No manifest found") manifest_dom = parse(tmp_file_name) nodes = manifest_dom.getElementsByTagName('assemblyIdentity') @@ -89,7 +92,8 @@ def test_assembly_binding(src_filename, assembly_name, assembly_ver): versions.append(node.getAttribute('version')) if len(versions) == 0: - print "No manifest found for %s" % src_filename + print "No matching assemblies found in %s" % src_filename + raise Exception("No matching assembly") elif len(versions) > 1: print "Multiple bindings to %s found:" % assembly_name @@ -108,7 +112,6 @@ def test_assembly_binding(src_filename, assembly_name, assembly_ver): print "SUCCESS: %s OK!" % src_filename print - if __name__ == '__main__': print |