From f113f165f9b1a102df2c8e0a4598bab771fd4b91 Mon Sep 17 00:00:00 2001 From: Mike Sinkovsky Date: Thu, 2 Feb 2017 15:23:17 +0500 Subject: 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 --- test cases/common/135 generated assembly/copy.py | 6 ------ test cases/common/135 generated assembly/copyfile.py | 6 ++++++ test cases/common/135 generated assembly/meson.build | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 test cases/common/135 generated assembly/copy.py create mode 100644 test cases/common/135 generated assembly/copyfile.py diff --git a/test cases/common/135 generated assembly/copy.py b/test cases/common/135 generated assembly/copy.py deleted file mode 100644 index da503e2..0000000 --- a/test cases/common/135 generated assembly/copy.py +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env python - -import sys -import shutil - -shutil.copyfile(sys.argv[1], sys.argv[2]) diff --git a/test cases/common/135 generated assembly/copyfile.py b/test cases/common/135 generated assembly/copyfile.py new file mode 100644 index 0000000..da503e2 --- /dev/null +++ b/test cases/common/135 generated assembly/copyfile.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python + +import sys +import shutil + +shutil.copyfile(sys.argv[1], sys.argv[2]) diff --git a/test cases/common/135 generated assembly/meson.build b/test cases/common/135 generated assembly/meson.build index b5e81d5..6a8744b 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' -- cgit v1.1