Prefix temp data dirs with the node name

This makes it easier to relate the temporary data dirs to each node in
a test script.

Author: Kyotaro Horiguchi
Reviewed-By: Craig Ringer, Alvaro Herrera

diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm
index a8e6f0c3bbf5fa4d2771d3114a0c7682d562ea18..4ca7f7780db2ff480c63d623c0073c196300e3a8 100644 (file)
--- a/src/test/perl/PostgresNode.pm
+++ b/src/test/perl/PostgresNode.pm
@@ -115,7 +115,7 @@ sub new
        my $self   = {
                _port     => $pgport,
                _host     => $pghost,
-               _basedir  => TestLib::tempdir,
+               _basedir  => TestLib::tempdir("data_" . $name),
                _name     => $name,
                _logfile  => "$TestLib::log_path/${testname}_${name}.log" };
 

diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
index 564936e5e5758f4fd5ee96f6917cd77e2274691c..f1b5f8af8a06a8e092c7c5a40df0ad79cdce9f14 100644 (file)
--- a/src/test/perl/TestLib.pm
+++ b/src/test/perl/TestLib.pm
@@ -128,9 +128,11 @@ sub all_tests_passing
 #
 sub tempdir
 {
+       my ($prefix) = @_;
+       $prefix = "tmp_test" unless defined $prefix;
        return File::Temp::tempdir(
-               'tmp_testXXXX',
-               DIR => $tmp_check,
+               $prefix . '_XXXX',
+               DIR     => $tmp_check,
                CLEANUP => 1);
 }