aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Sinkovsky <msink@permonline.ru>2017-02-02 15:23:17 +0500
committerNirbheek Chauhan <nirbheek@centricular.com>2017-02-04 00:53:44 +0530
commitf113f165f9b1a102df2c8e0a4598bab771fd4b91 (patch)
treeaf5140337ef649269b101079c6fb64b84c792ccb
parenta9c4428c6925c921102e52aeaea1b92ed6914af1 (diff)
downloadmeson-f113f165f9b1a102df2c8e0a4598bab771fd4b91.zip
meson-f113f165f9b1a102df2c8e0a4598bab771fd4b91.tar.gz
meson-f113f165f9b1a102df2c8e0a4598bab771fd4b91.tar.bz2
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
-rw-r--r--test cases/common/135 generated assembly/copyfile.py (renamed from test cases/common/135 generated assembly/copy.py)0
-rw-r--r--test cases/common/135 generated assembly/meson.build2
2 files changed, 1 insertions, 1 deletions
diff --git a/test cases/common/135 generated assembly/copy.py b/test cases/common/135 generated assembly/copyfile.py
index da503e2..da503e2 100644
--- a/test cases/common/135 generated assembly/copy.py
+++ b/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 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'