|
|
@ -155,7 +155,7 @@ def platform_fix_name(fname, compiler, env): |
|
|
|
|
|
|
|
|
|
|
|
if fname.startswith('?gcc:'): |
|
|
|
if fname.startswith('?gcc:'): |
|
|
|
fname = fname[5:] |
|
|
|
fname = fname[5:] |
|
|
|
if compiler == 'cl': |
|
|
|
if compiler == 'cl' or fname.endswith('dll.a') and not mesonlib.for_cygwin(env.is_cross_build(), env): |
|
|
|
return None |
|
|
|
return None |
|
|
|
|
|
|
|
|
|
|
|
return fname |
|
|
|
return fname |
|
|
@ -183,19 +183,12 @@ def validate_install(srcdir, installdir, compiler, env): |
|
|
|
expected[fname] = True |
|
|
|
expected[fname] = True |
|
|
|
for (fname, found) in expected.items(): |
|
|
|
for (fname, found) in expected.items(): |
|
|
|
if not found: |
|
|
|
if not found: |
|
|
|
# Ignore missing PDB files if we aren't using cl |
|
|
|
|
|
|
|
if fname.endswith('.pdb') and compiler != 'cl': |
|
|
|
|
|
|
|
continue |
|
|
|
|
|
|
|
ret_msg += 'Expected file {0} missing.\n'.format(fname) |
|
|
|
ret_msg += 'Expected file {0} missing.\n'.format(fname) |
|
|
|
# Check if there are any unexpected files |
|
|
|
# Check if there are any unexpected files |
|
|
|
found = get_relative_files_list_from_dir(installdir) |
|
|
|
found = get_relative_files_list_from_dir(installdir) |
|
|
|
for fname in found: |
|
|
|
for fname in found: |
|
|
|
# Windows-specific tests check for the existence of installed PDB |
|
|
|
|
|
|
|
# files, but common tests do not, for obvious reasons. Ignore any |
|
|
|
|
|
|
|
# extra PDB files found. |
|
|
|
|
|
|
|
if fname not in expected: |
|
|
|
if fname not in expected: |
|
|
|
if not (fname.endswith('.pdb') and compiler != 'cl'): |
|
|
|
ret_msg += 'Extra file {0} found.\n'.format(fname) |
|
|
|
ret_msg += 'Extra file {0} found.\n'.format(fname) |
|
|
|
|
|
|
|
return ret_msg |
|
|
|
return ret_msg |
|
|
|
|
|
|
|
|
|
|
|
def log_text_file(logfile, testdir, stdo, stde): |
|
|
|
def log_text_file(logfile, testdir, stdo, stde): |
|
|
|