From 53ff676914c3cdc30f40acab3b6589bf97660acf Mon Sep 17 00:00:00 2001 From: njoly Date: Fri, 25 Mar 2011 19:19:45 +0000 Subject: [PATCH] Add require.progs properties for needed tools to avoid failures when comp.tgz set is not installed. --- tests/toolchain/cc/t_hello.sh | 4 +++- tests/util/config/t_config.sh | 3 ++- tests/util/xlint/lint1/t_integration.sh | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/toolchain/cc/t_hello.sh b/tests/toolchain/cc/t_hello.sh index 1800a7bfe5f2..2e5b0816676e 100644 --- a/tests/toolchain/cc/t_hello.sh +++ b/tests/toolchain/cc/t_hello.sh @@ -1,4 +1,4 @@ -# $NetBSD: t_hello.sh,v 1.1 2011/02/24 10:24:24 pooka Exp $ +# $NetBSD: t_hello.sh,v 1.2 2011/03/25 19:19:45 njoly Exp $ # # Copyright (c) 2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -28,11 +28,13 @@ atf_test_case hello hello_head() { atf_set "descr" "compile and run \"hello world\"" + atf_set "require.progs" "cc" } atf_test_case hello_pic hello_pic_head() { atf_set "descr" "compile and run PIC \"hello world\"" + atf_set "require.progs" "cc" } hello_body() { diff --git a/tests/util/config/t_config.sh b/tests/util/config/t_config.sh index fe3ce7d5db34..89304f0fccc9 100644 --- a/tests/util/config/t_config.sh +++ b/tests/util/config/t_config.sh @@ -1,4 +1,4 @@ -# $NetBSD: t_config.sh,v 1.2 2010/11/07 17:51:22 jmmv Exp $ +# $NetBSD: t_config.sh,v 1.3 2011/03/25 19:19:46 njoly Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -59,6 +59,7 @@ test_case() atf_test_case "${name}" eval "${name}_head() { \ atf_set descr \"${descr}\"; \ + atf_set require.progs \"config\"; \ }" eval "${name}_body() { \ run_and_check_${type} '${name}'; \ diff --git a/tests/util/xlint/lint1/t_integration.sh b/tests/util/xlint/lint1/t_integration.sh index 6864b85510de..406243aab9e1 100644 --- a/tests/util/xlint/lint1/t_integration.sh +++ b/tests/util/xlint/lint1/t_integration.sh @@ -1,4 +1,4 @@ -# $NetBSD: t_integration.sh,v 1.1 2010/07/18 10:11:01 jmmv Exp $ +# $NetBSD: t_integration.sh,v 1.2 2011/03/25 19:19:46 njoly Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -49,6 +49,7 @@ test_case() atf_test_case ${name} eval "${name}_head() { atf_set \"descr\" \"${descr}\"; + atf_set \"require.progs\" \"${LINT1}\"; }" eval "${name}_body() { ${result} d_${name}.c;