From 9e684a3a797341edca72fa72cd91577f17212195 Mon Sep 17 00:00:00 2001 From: Julio Merino Date: Mon, 25 Nov 2013 13:30:06 +0000 Subject: [PATCH] Generate plain sh test programs from a source file. Instead of assuming that plain sh test programs exist in the source tree in their final form and are marked as executable, generate them from a list of sources. By default, just assume that the source file for a program P is P.sh but allow the caller to customize the inputs. Similarly, also allow the caller to apply sed(1) replacements on the output. These will both be useful in hooking existing test code from tools/regression/ into the test suite. Approved by: rpaulo (mentor) --- .../examples/tests/tests/plain/{cp_test => cp_test.sh} | 0 share/mk/plain.test.mk | 10 ++++++++++ 2 files changed, 10 insertions(+) rename share/examples/tests/tests/plain/{cp_test => cp_test.sh} (100%) mode change 100755 => 100644 diff --git a/share/examples/tests/tests/plain/cp_test b/share/examples/tests/tests/plain/cp_test.sh old mode 100755 new mode 100644 similarity index 100% rename from share/examples/tests/tests/plain/cp_test rename to share/examples/tests/tests/plain/cp_test.sh diff --git a/share/mk/plain.test.mk b/share/mk/plain.test.mk index b41c5856c614..2e2752db7fa3 100644 --- a/share/mk/plain.test.mk +++ b/share/mk/plain.test.mk @@ -46,6 +46,16 @@ _TESTS+= ${PLAIN_TESTS_SH} .for _T in ${PLAIN_TESTS_SH} SCRIPTSDIR_${_T}= ${TESTSDIR} TEST_INTERFACE.${_T}= plain +CLEANFILES+= ${_T} ${_T}.tmp +# TODO(jmmv): It seems to me that this SED and SRC functionality should +# exist in bsd.prog.mk along the support for SCRIPTS. Move it there if +# this proves to be useful within the tests. +PLAIN_TESTS_SH_SED_${_T}?= # empty +PLAIN_TESTS_SH_SRC_${_T}?= ${_T}.sh +${_T}: ${PLAIN_TESTS_SH_SRC_${_T}} + cat ${.ALLSRC} | sed ${PLAIN_TESTS_SH_SED_${_T}} >${.TARGET}.tmp + chmod +x ${.TARGET}.tmp + mv ${.TARGET}.tmp ${.TARGET} .endfor .endif