From f113f165f9b1a102df2c8e0a4598bab771fd4b91 Mon Sep 17 00:00:00 2001 From: Mike Sinkovsky Date: Thu, 2 Feb 2017 15:23:17 +0500 Subject: [PATCH 1/2] test cases\common\135 generated assembly: rename copy.py because down the import dependency chain of copy.py the 'tarfile' module was trying to import the 'copy' standard library module but was finding the copy.py file first because it was in the current directory. Closes https://github.com/mesonbuild/meson/issues/1359 --- .../common/135 generated assembly/{copy.py => copyfile.py} | 0 test cases/common/135 generated assembly/meson.build | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename test cases/common/135 generated assembly/{copy.py => copyfile.py} (100%) diff --git a/test cases/common/135 generated assembly/copy.py b/test cases/common/135 generated assembly/copyfile.py similarity index 100% rename from test cases/common/135 generated assembly/copy.py rename to test cases/common/135 generated assembly/copyfile.py diff --git a/test cases/common/135 generated assembly/meson.build b/test cases/common/135 generated assembly/meson.build index b5e81d586..6a8744b19 100644 --- a/test cases/common/135 generated assembly/meson.build +++ b/test cases/common/135 generated assembly/meson.build @@ -17,7 +17,7 @@ if cc.symbols_have_underscore_prefix() add_project_arguments('-DMESON_TEST__UNDERSCORE_SYMBOL', language : 'c') endif -copy = find_program('copy.py') +copy = find_program('copyfile.py') output = 'square-@0@.S'.format(cpu) input = output + '.in' From 8e585b468b063d598bdc192cf7a799d2f5c1e531 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Sun, 5 Feb 2017 04:34:07 +0530 Subject: [PATCH 2/2] tests/common/134: Rename copy.py to copyfile.py On some distros, running this causes Python to find the file itself as the implementation of the `copy` module: $ python3 copy.py Traceback (most recent call last): File "copy.py", line 4, in import shutil File "/usr/lib/python3.4/shutil.py", line 14, in import tarfile File "/usr/lib/python3.4/tarfile.py", line 48, in import copy File "/c/Users/nirbheek/projects/meson.git/test cases/common/134 generated llvm ir/copy.py", line 6, in shutil.copyfile(sys.argv[1], sys.argv[2]) AttributeError: 'module' object has no attribute 'copyfile' --- .../common/134 generated llvm ir/{copy.py => copyfile.py} | 0 test cases/common/134 generated llvm ir/meson.build | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename test cases/common/134 generated llvm ir/{copy.py => copyfile.py} (100%) diff --git a/test cases/common/134 generated llvm ir/copy.py b/test cases/common/134 generated llvm ir/copyfile.py similarity index 100% rename from test cases/common/134 generated llvm ir/copy.py rename to test cases/common/134 generated llvm ir/copyfile.py diff --git a/test cases/common/134 generated llvm ir/meson.build b/test cases/common/134 generated llvm ir/meson.build index 7982c23bf..111cdc063 100644 --- a/test cases/common/134 generated llvm ir/meson.build +++ b/test cases/common/134 generated llvm ir/meson.build @@ -4,7 +4,7 @@ if meson.get_compiler('c').get_id() != 'clang' error('MESON_SKIP_TEST: LLVM IR files can only be built with clang') endif -copy = find_program('copy.py') +copy = find_program('copyfile.py') copygen = generator(copy, arguments : ['@INPUT@', '@OUTPUT@'],