diff options
| author | knarf <knarf@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2011-09-26 13:47:58 +0000 |
|---|---|---|
| committer | knarf <knarf@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2011-09-26 13:47:58 +0000 |
| commit | 26419a0ca32cf1d0b678b094a03f058e7a0b0880 (patch) | |
| tree | 5590b0c8e4e443c17fec2bf01b5901ce08b98f59 /lib/sbin | |
| parent | 3160d5a90ba91557ae9d5aa11d283a575932fac1 (diff) | |
Depreciate config files in test/ directories.
If for some reason there exists both a test.ccl and a file 'config' in a
thorn's test directory, Cactus uses the config file while telling the user that
it's using the test.ccl. Config is so outdated this shouldn't affect anybody.
This patch depreciates config files. Support for test.ccl was added in 2002 and
I coulnd't find a single thorn which still uses config files.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4733 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/sbin')
| -rw-r--r-- | lib/sbin/RunTestUtils.pl | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/lib/sbin/RunTestUtils.pl b/lib/sbin/RunTestUtils.pl index c6063eb8..8b9a73f9 100644 --- a/lib/sbin/RunTestUtils.pl +++ b/lib/sbin/RunTestUtils.pl @@ -154,25 +154,18 @@ sub ParseTestConfigs { my $testdir = $arrangement_dir . $testdata->{"$thorn ARRANGEMENT"} . "${sep}$thorn${sep}test"; - my $old_config_file = "$testdir${sep}test.ccl"; - my $new_config_file = "$testdir${sep}config"; - my $config_file = ''; + my $config_file = "$testdir${sep}test.ccl"; + my $old_config_file = "$testdir${sep}config"; - if (-r $old_config_file and -r $new_config_file) + if (-r $old_config_file) { - print " Thorn $thorn has a test.ccl file and a config file.\n" . - " Config files will be deprecated, using test.ccl file.\n"; - $config_file = $new_config_file; + print " Thorn $thorn has a 'config' file in 'test/'.\n" + " Config files are deprecated. Use test.ccl instead.\n"; } - elsif (-r $new_config_file) + if (!-r $config_file) { - $config_file = $new_config_file; + $config_file = ''; } - elsif (-r $old_config_file) - { - $config_file = $old_config_file; - } - next unless ($config_file); my @config = &read_file($config_file); for($line_number = 0; $line_number < @config; $line_number++) |