summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2010-06-21 13:43:35 -0700
committerDan Nicholson <dbn.lists@gmail.com>2010-06-21 15:29:42 -0700
commit559d07c764a50d99d04b805e2e2bca9ff5a296c6 (patch)
tree2852af45960b2f828ed5d711749944b7cc4b04d0
parentc68c75d0fb30b6dff512bcede72435d8f8dd0eb6 (diff)
Revert "tcc: Check for scenarios with and without current directory prefix"
This reverts commit 9ae6abd455e9b52bbdf88bb5a03874dc1ad7e26a. The rationale for this commit was that automake would call the scenario with a "./" prefix. Since we're no longer using the automake test framework, we can drop this hack. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
-rw-r--r--src/tet3/tcc/scen3.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/tet3/tcc/scen3.c b/src/tet3/tcc/scen3.c
index 5a0b20c8..5ef5b72b 100644
--- a/src/tet3/tcc/scen3.c
+++ b/src/tet3/tcc/scen3.c
@@ -83,19 +83,13 @@ char *scenario;
{
register struct scentab *ep;
struct scentab *myscen = (struct scentab *) 0;
- int cwd_prefix;
-
- /* If the scenario has the current directory "./" prefix,
- * also check for the non-prefixed name */
- cwd_prefix = (!strncmp(scenario, "./", 2)) ? 1 : 0;
/* set the SCF_NEEDED flag in the chosen scenario */
TRACE1(tet_Tscen, 1, "proc3sctree(): marking needed scenarios");
for (ep = sctree; ep; ep = ep->sc_forw) {
ASSERT(ep->sc_magic == SC_MAGIC);
ASSERT(ep->sc_type == SC_SCENARIO);
- if (!strcmp(ep->sc_scenario, scenario) ||
- (cwd_prefix && !strcmp(ep->sc_scenario, &scenario[2]))) {
+ if (!strcmp(ep->sc_scenario, scenario)) {
TRACE2(tet_Tscen, 6, "chosen scenario %s is needed",
ep->sc_scenario);
ep->sc_flags |= SCF_NEEDED;