Skip to content

Commit

Permalink
ktest: Add DEFINED keyword for IF statements
Browse files Browse the repository at this point in the history
Have IF statements process if a config variable or option has been
defined or not. Can use NOT DEFINED in the case for telling if
a variable or option has not been defined.

DEFAULTS IF NOT DEFINED SSH_USER
SSH_USER = root

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
  • Loading branch information
Steven Rostedt authored and Steven Rostedt committed Oct 17, 2011
1 parent 3d1cc41 commit 9900b5d
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 1 deletion.
17 changes: 16 additions & 1 deletion tools/testing/ktest/ktest.pl
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,13 @@ sub process_compare {
return $ret;
}

sub value_defined {
my ($val) = @_;

return defined($variable{$2}) ||
defined($opt{$2});
}

sub process_if {
my ($name, $value) = @_;

Expand All @@ -409,13 +416,21 @@ sub process_if {
return $ret;
}

if ($val =~ /^\s*(NOT\s*)?DEFINED\s+(\S+)\s*$/) {
if (defined $1) {
return !value_defined($2);
} else {
return value_defined($2);
}
}

if ($val =~ /^\s*0\s*$/) {
return 0;
} elsif ($val =~ /^\s*\d+\s*$/) {
return 1;
}

die ("$name: $.: Undefined variable $val in if statement\n");
die ("$name: $.: Undefined content $val in if statement\n");
return 1;
}

Expand Down
17 changes: 17 additions & 0 deletions tools/testing/ktest/sample.conf
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,23 @@
# ELSE
# BUILD_TYPE = useconfig:${CONFIG_DIR}/config-64
#
# The DEFINED keyword can be used by the IF statements too.
# It returns true if the given config variable or option has been defined
# or false otherwise.
#
#
# DEFAULTS IF DEFINED USE_CC
# CC := ${USE_CC}
# ELSE
# CC := gcc
#
#
# As well as NOT DEFINED.
#
# DEFAULTS IF NOT DEFINED MAKE_CMD
# MAKE_CMD := make ARCH=x86
#
#
#
# INCLUDE file
#
Expand Down

0 comments on commit 9900b5d

Please sign in to comment.