aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-02-06 19:10:38 +0100
committerGitHub <noreply@github.com>2017-02-06 19:10:38 +0100
commit34cc5bcc9f3721591cfe362a2208fdcb52b14f97 (patch)
tree49db1816418a2ea097bdbb4730c05ad67f6d382e
parent97911c4384238b1f77220b62e245d33f51f7b17a (diff)
parent8e585b468b063d598bdc192cf7a799d2f5c1e531 (diff)
downloadmeson-34cc5bcc9f3721591cfe362a2208fdcb52b14f97.zip
meson-34cc5bcc9f3721591cfe362a2208fdcb52b14f97.tar.gz
meson-34cc5bcc9f3721591cfe362a2208fdcb52b14f97.tar.bz2
Merge pull request #1360 from centricular/fix-arch-python
test cases\common\135 generated assembly: rename copy.py
-rw-r--r--test cases/common/134 generated llvm ir/copyfile.py (renamed from test cases/common/134 generated llvm ir/copy.py)0
-rw-r--r--test cases/common/134 generated llvm ir/meson.build2
-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
4 files changed, 2 insertions, 2 deletions
diff --git a/test cases/common/134 generated llvm ir/copy.py b/test cases/common/134 generated llvm ir/copyfile.py
index da503e2..da503e2 100644
--- a/test cases/common/134 generated llvm ir/copy.py
+++ b/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 7982c23..111cdc0 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@'],
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'