aboutsummaryrefslogtreecommitdiff
path: root/test cases
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2019-07-17 22:54:58 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2019-08-06 21:34:15 +0300
commit5fd4963766fe53d4a6db24a2cb7cb54e21600fe9 (patch)
tree08c48cdf5927bfdf12d3a00a07135a2a9ad44b07 /test cases
parent534c95cc3eae86bb8e08bee5f5162ca65bc53461 (diff)
downloadmeson-5fd4963766fe53d4a6db24a2cb7cb54e21600fe9.zip
meson-5fd4963766fe53d4a6db24a2cb7cb54e21600fe9.tar.gz
meson-5fd4963766fe53d4a6db24a2cb7cb54e21600fe9.tar.bz2
Made build. options alias basic ones when native building.
Diffstat (limited to 'test cases')
-rw-r--r--test cases/unit/51 noncross options/meson.build14
-rw-r--r--test cases/unit/51 noncross options/prog.c (renamed from test cases/unit/51 std remains/prog.c)0
-rw-r--r--test cases/unit/51 noncross options/ylib.pc13
-rw-r--r--test cases/unit/51 std remains/meson.build2
4 files changed, 27 insertions, 2 deletions
diff --git a/test cases/unit/51 noncross options/meson.build b/test cases/unit/51 noncross options/meson.build
new file mode 100644
index 0000000..42e2cbb
--- /dev/null
+++ b/test cases/unit/51 noncross options/meson.build
@@ -0,0 +1,14 @@
+project('std_remains', 'c', default_options: ['c_std=c99'])
+
+executable('prog', 'prog.c')
+
+# Check that native: true does not affect the use of c_std in
+# non-cross builds
+
+if not meson.is_cross_build()
+ executable('prog2', 'prog.c', native: true)
+
+ # Check that even deps marked as native are found
+ # by default when not cross compiling.
+ dependency('ylib', method: 'pkg-config')
+endif
diff --git a/test cases/unit/51 std remains/prog.c b/test cases/unit/51 noncross options/prog.c
index 0314ff1..0314ff1 100644
--- a/test cases/unit/51 std remains/prog.c
+++ b/test cases/unit/51 noncross options/prog.c
diff --git a/test cases/unit/51 noncross options/ylib.pc b/test cases/unit/51 noncross options/ylib.pc
new file mode 100644
index 0000000..afec2d3
--- /dev/null
+++ b/test cases/unit/51 noncross options/ylib.pc
@@ -0,0 +1,13 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${prefix}/lib/x86_64-linux-gnu
+sharedlibdir=${libdir}
+includedir=${prefix}/include
+
+Name: ylib
+Description: ylib compression library
+Version: 1.2.3
+
+Requires:
+Libs: -L${libdir} -L${sharedlibdir} -ly
+Cflags: -I${includedir}
diff --git a/test cases/unit/51 std remains/meson.build b/test cases/unit/51 std remains/meson.build
deleted file mode 100644
index ac6f9e2..0000000
--- a/test cases/unit/51 std remains/meson.build
+++ /dev/null
@@ -1,2 +0,0 @@
-project('std_remains', 'c', default_options: ['c_std=c99'])
-executable('prog', 'prog.c')