From 1865425b4bbf87f9198353dd730de748680d3979 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Mon, 12 Jun 2017 22:39:33 +0530 Subject: tests/unit/8: Rename to 9 and add -l flags --- test cases/unit/8 L order/first.pc | 13 ------------- test cases/unit/8 L order/meson.build | 6 ------ test cases/unit/8 L order/prog.c | 5 ----- test cases/unit/8 L order/second.pc | 13 ------------- test cases/unit/9 -L -l order/first.pc | 13 +++++++++++++ test cases/unit/9 -L -l order/meson.build | 6 ++++++ test cases/unit/9 -L -l order/prog.c | 5 +++++ test cases/unit/9 -L -l order/second.pc | 13 +++++++++++++ 8 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 test cases/unit/8 L order/first.pc delete mode 100644 test cases/unit/8 L order/meson.build delete mode 100644 test cases/unit/8 L order/prog.c delete mode 100644 test cases/unit/8 L order/second.pc create mode 100644 test cases/unit/9 -L -l order/first.pc create mode 100644 test cases/unit/9 -L -l order/meson.build create mode 100644 test cases/unit/9 -L -l order/prog.c create mode 100644 test cases/unit/9 -L -l order/second.pc (limited to 'test cases/unit') diff --git a/test cases/unit/8 L order/first.pc b/test cases/unit/8 L order/first.pc deleted file mode 100644 index 8066f6e72..000000000 --- a/test cases/unit/8 L order/first.pc +++ /dev/null @@ -1,13 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${prefix}/lib/x86_64-linux-gnu -sharedlibdir=${libdir} -includedir=${prefix}/include - -Name: jonne -Description: jonne library -Version: 1.0.0 - -Requires: -Libs: -L/me/first -L/me/second -Cflags: -I${includedir} diff --git a/test cases/unit/8 L order/meson.build b/test cases/unit/8 L order/meson.build deleted file mode 100644 index cfcf033fa..000000000 --- a/test cases/unit/8 L order/meson.build +++ /dev/null @@ -1,6 +0,0 @@ -project('jonne', 'c') - -firstdep = dependency('first') -seconddep = dependency('second') - -executable('lprog', 'prog.c', dependencies : [firstdep, seconddep]) diff --git a/test cases/unit/8 L order/prog.c b/test cases/unit/8 L order/prog.c deleted file mode 100644 index 3a16ac3dc..000000000 --- a/test cases/unit/8 L order/prog.c +++ /dev/null @@ -1,5 +0,0 @@ -#include - -int main(int argc, char **argv) { - return 0; -} diff --git a/test cases/unit/8 L order/second.pc b/test cases/unit/8 L order/second.pc deleted file mode 100644 index 602f2629f..000000000 --- a/test cases/unit/8 L order/second.pc +++ /dev/null @@ -1,13 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${prefix}/lib/x86_64-linux-gnu -sharedlibdir=${libdir} -includedir=${prefix}/include - -Name: jonne2 -Description: jonne2 library -Version: 1.0.0 - -Requires: -Libs: -L/me/third -L/me/fourth -Cflags: -I${includedir} diff --git a/test cases/unit/9 -L -l order/first.pc b/test cases/unit/9 -L -l order/first.pc new file mode 100644 index 000000000..3b811b2e2 --- /dev/null +++ b/test cases/unit/9 -L -l order/first.pc @@ -0,0 +1,13 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${prefix}/lib/x86_64-linux-gnu +sharedlibdir=${libdir} +includedir=${prefix}/include + +Name: jonne +Description: jonne library +Version: 1.0.0 + +Requires: +Libs: -L/me/first -lfoo1 -L/me/second -lfoo2 +Cflags: -I${includedir} diff --git a/test cases/unit/9 -L -l order/meson.build b/test cases/unit/9 -L -l order/meson.build new file mode 100644 index 000000000..cfcf033fa --- /dev/null +++ b/test cases/unit/9 -L -l order/meson.build @@ -0,0 +1,6 @@ +project('jonne', 'c') + +firstdep = dependency('first') +seconddep = dependency('second') + +executable('lprog', 'prog.c', dependencies : [firstdep, seconddep]) diff --git a/test cases/unit/9 -L -l order/prog.c b/test cases/unit/9 -L -l order/prog.c new file mode 100644 index 000000000..3a16ac3dc --- /dev/null +++ b/test cases/unit/9 -L -l order/prog.c @@ -0,0 +1,5 @@ +#include + +int main(int argc, char **argv) { + return 0; +} diff --git a/test cases/unit/9 -L -l order/second.pc b/test cases/unit/9 -L -l order/second.pc new file mode 100644 index 000000000..196824b74 --- /dev/null +++ b/test cases/unit/9 -L -l order/second.pc @@ -0,0 +1,13 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${prefix}/lib/x86_64-linux-gnu +sharedlibdir=${libdir} +includedir=${prefix}/include + +Name: jonne2 +Description: jonne2 library +Version: 1.0.0 + +Requires: +Libs: -L/me/third -lfoo3 -L/me/fourth -lfoo4 +Cflags: -I${includedir} -- cgit v1.2.3