selftest: Use convenience function for prepending paths to environment variables.

diff --git a/source/selftest/selftest.pl b/source/selftest/selftest.pl
index 3270364a91ecab153a1b3460e1605b31d0951026..5854a94b8d1369ef9ac312f8b9464b8fee2016c9 100755 (executable)
--- a/source/selftest/selftest.pl
+++ b/source/selftest/selftest.pl
@@ -407,14 +407,19 @@ my $tls_enabled = not $opt_quick;
 $ENV{TLS_ENABLED} = ($tls_enabled?"yes":"no");
 $ENV{LDB_MODULES_PATH} = "$old_pwd/bin/modules/ldb";
 $ENV{LD_SAMBA_MODULE_PATH} = "$old_pwd/bin/modules";
-if (defined($ENV{PKG_CONFIG_PATH})) {
-       $ENV{PKG_CONFIG_PATH} = "$old_pwd/bin/pkgconfig:$ENV{PKG_CONFIG_PATH}";
-} else { 
-       $ENV{PKG_CONFIG_PATH} = "$old_pwd/bin/pkgconfig";
+sub prefix_pathvar($$)
+{
+       my ($name, $newpath) = @_;
+       if (defined($ENV{$name})) {
+               $ENV{$name} = "$newpath:$ENV{$name}";
+       } else {
+               $ENV{$name} = $newpath;
+       }
 }
+prefix_pathvar("PKG_CONFIG_PATH", "$old_pwd/bin/pkgconfig");
 # Required for smbscript:
-$ENV{PATH} = "$old_pwd/bin:$old_pwd:$ENV{PATH}";
-$ENV{PYTHONPATH} = "$builddir/bin/python:$ENV{PYTHONPATH}";
+prefix_pathvar("PATH", "$old_pwd/bin");
+prefix_pathvar("PYTHONPATH", "$old_pwd/bin/python");
 
 if ($opt_socket_wrapper_keep_pcap) {
        # Socket wrapper keep pcap implies socket wrapper pcap