Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 285887
b: refs/heads/master
c: 0e7a22d
h: refs/heads/master
i:
  285885: 99c0bce
  285883: a5c7b7b
  285879: ece042e
  285871: 21a39b1
  285855: b27bc98
  285823: ecd5eff
v: v3
  • Loading branch information
Steven Rostedt authored and Steven Rostedt committed Nov 23, 2011
1 parent 0c4e302 commit 37133bb
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 600bbf0aa2229390ba1c4ca4c5666c593ff9ef56
refs/heads/master: 0e7a22de25212cfcaa0ba2c957e4e60eaa70fb9d
19 changes: 17 additions & 2 deletions trunk/tools/testing/ktest/ktest.pl
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,15 @@
;
$config_help{"BUILD_DIR"} = << "EOF"
The directory that contains the Linux source code (full path).
You can use \${PWD} that will be the path where ktest.pl is run, or use
\${THIS_DIR} which is assigned \${PWD} but may be changed later.
EOF
;
$config_help{"OUTPUT_DIR"} = << "EOF"
The directory that the objects will be built (full path).
(can not be same as BUILD_DIR)
You can use \${PWD} that will be the path where ktest.pl is run, or use
\${THIS_DIR} which is assigned \${PWD} but may be changed later.
EOF
;
$config_help{"BUILD_TARGET"} = << "EOF"
Expand Down Expand Up @@ -282,7 +286,7 @@ sub get_ktest_config {
next;
}
}
$entered_configs{$config} = process_variables($ans);
$entered_configs{$config} = ${ans};
last;
}
}
Expand Down Expand Up @@ -3012,6 +3016,17 @@ sub make_min_config {
print OUT << "EOF"
# Generated by ktest.pl
#
# PWD is a ktest.pl variable that will result in the process working
# directory that ktest.pl is executed in.
# THIS_DIR is automatically assigned the PWD of the path that generated
# the config file. It is best to use this variable when assigning other
# directory paths within this directory. This allows you to easily
# move the test cases to other locations or to other machines.
#
THIS_DIR := $variable{"PWD"}
# Define each test with TEST_START
# The config options below it will override the defaults
TEST_START
Expand All @@ -3034,7 +3049,7 @@ sub make_min_config {
open(OUT, ">>$ktest_config") or die "Can not append to $ktest_config";
foreach my $config (@new_configs) {
print OUT "$config = $entered_configs{$config}\n";
$opt{$config} = $entered_configs{$config};
$opt{$config} = process_variables($entered_configs{$config});
}
}

Expand Down

0 comments on commit 37133bb

Please sign in to comment.