From 5d900ea8ccb660d4d3bb9aaa08464fb9aae081f9 Mon Sep 17 00:00:00 2001 From: Björn Persson Date: Fri, 31 Jan 2014 08:32:17 +0100 Subject: Check that the right generated files exist. --- testsuite/sources/library_1/Makefile | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 testsuite/sources/library_1/Makefile (limited to 'testsuite/sources/library_1/Makefile') diff --git a/testsuite/sources/library_1/Makefile b/testsuite/sources/library_1/Makefile new file mode 100644 index 0000000..f0c587b --- /dev/null +++ b/testsuite/sources/library_1/Makefile @@ -0,0 +1,20 @@ +# part of Comfignat's testsuite +# Copyright 2014 B. Persson, Bjorn@Rombobeorn.se +# +# This material is provided as is, with absolutely no warranty expressed +# or implied. Any use is at your own risk. +# +# Permission is hereby granted to use or copy this testsuite +# for any purpose, provided the above notices are retained on all copies. +# Permission to modify the code and to distribute modified code is granted, +# provided the above notices are retained, and a notice that the code was +# modified is included with the above copyright notice. + + +include comfignat.mk + +options = frobnicate +frobnicate = false + +build_GPRs = build_testcase.gpr +usage_GPRs = testcase.gpr -- cgit v1.2.3 From 196afc75a68b7e6557b56d7cc22c37a80c09ccf7 Mon Sep 17 00:00:00 2001 From: Björn Persson Date: Sat, 1 Feb 2014 11:34:30 +0100 Subject: Test variable conveyance to a sub-Make. --- testsuite/inputs/directories_project | 2 +- testsuite/sources/library_1/Makefile | 5 +++++ testsuite/sources/library_1/generated_files | 1 + testsuite/sources/library_1/subdir/Makefile | 15 +++++++++++++++ testsuite/sources/library_1/subdir/helper/Makefile | 19 +++++++++++++++++++ testsuite/sources/library_1/subdir/helper/script | 3 +++ 6 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 testsuite/sources/library_1/subdir/Makefile create mode 100644 testsuite/sources/library_1/subdir/helper/Makefile create mode 100755 testsuite/sources/library_1/subdir/helper/script (limited to 'testsuite/sources/library_1/Makefile') diff --git a/testsuite/inputs/directories_project b/testsuite/inputs/directories_project index 128e893..e477a8d 100644 --- a/testsuite/inputs/directories_project +++ b/testsuite/inputs/directories_project @@ -2,4 +2,4 @@ prefix=/opt/comfignat_test expect_configuration expect_generated_files common_setup -make dirgpr="${dirgpr}" gprdir="${gprdir}" +make dirgpr="${dirgpr}" gprdir="${gprdir}" libexecdir="${libexecdir}" diff --git a/testsuite/sources/library_1/Makefile b/testsuite/sources/library_1/Makefile index f0c587b..4047099 100644 --- a/testsuite/sources/library_1/Makefile +++ b/testsuite/sources/library_1/Makefile @@ -18,3 +18,8 @@ frobnicate = false build_GPRs = build_testcase.gpr usage_GPRs = testcase.gpr + +submake: + @${MAKE} --directory=${srcdir}/subdir + +build: submake diff --git a/testsuite/sources/library_1/generated_files b/testsuite/sources/library_1/generated_files index 525613f..4ff4941 100644 --- a/testsuite/sources/library_1/generated_files +++ b/testsuite/sources/library_1/generated_files @@ -5,3 +5,4 @@ ${stage_libdir}/libtestcase${frobnicate:+-frob}.so.1 ${stage_libdir}/libtestcase.so ${stage_alidir}/testcase/testcase.ali ${stage_gprdir}/testcase.gpr +${stage_libexecdir}/testcase/script diff --git a/testsuite/sources/library_1/subdir/Makefile b/testsuite/sources/library_1/subdir/Makefile new file mode 100644 index 0000000..9434d2d --- /dev/null +++ b/testsuite/sources/library_1/subdir/Makefile @@ -0,0 +1,15 @@ +# part of Comfignat's testsuite +# Copyright 2014 B. Persson, Bjorn@Rombobeorn.se +# +# This material is provided as is, with absolutely no warranty expressed +# or implied. Any use is at your own risk. +# +# Permission is hereby granted to use or copy this testsuite +# for any purpose, provided the above notices are retained on all copies. +# Permission to modify the code and to distribute modified code is granted, +# provided the above notices are retained, and a notice that the code was +# modified is included with the above copyright notice. + + +submake: + @${MAKE} --directory=helper diff --git a/testsuite/sources/library_1/subdir/helper/Makefile b/testsuite/sources/library_1/subdir/helper/Makefile new file mode 100644 index 0000000..71d0399 --- /dev/null +++ b/testsuite/sources/library_1/subdir/helper/Makefile @@ -0,0 +1,19 @@ +# part of Comfignat's testsuite +# Copyright 2014 B. Persson, Bjorn@Rombobeorn.se +# +# This material is provided as is, with absolutely no warranty expressed +# or implied. Any use is at your own risk. +# +# Permission is hereby granted to use or copy this testsuite +# for any purpose, provided the above notices are retained on all copies. +# Permission to modify the code and to distribute modified code is granted, +# provided the above notices are retained, and a notice that the code was +# modified is included with the above copyright notice. + + +include comfignat.mk + +build: ${stage_libexecdir}/testcase/script + +${stage_libexecdir}/testcase/script: script | ${stage_libexecdir}/testcase/ + cp -p $< $@ diff --git a/testsuite/sources/library_1/subdir/helper/script b/testsuite/sources/library_1/subdir/helper/script new file mode 100755 index 0000000..f013b39 --- /dev/null +++ b/testsuite/sources/library_1/subdir/helper/script @@ -0,0 +1,3 @@ +#!/bin/bash + +echo "Hi ho!" -- cgit v1.2.3