Remove hard-coded paths in daemons.go.

kvap · kvap · commit 1c90d780780e · 2015-10-06T12:55:07.000+03:00
diff --git a/contrib/pg_dtm/tests/daemons.go b/contrib/pg_dtm/tests/daemons.go
@@ -8,6 +8,7 @@ import (
 	"sync"
 	"os"
 	"strconv"
+	"strings"
 )
 
 func read_to_channel(r io.Reader, c chan string, wg *sync.WaitGroup) {
@@ -94,6 +95,7 @@ func postgres(bin string, datadir string, port int, nodeid int, wg *sync.WaitGro
 		"-c", "autovacuum=off",
 		"-c", "fsync=off",
 		"-c", "synchronous_commit=off",
+		"-c", "shared_preload_libraries=pg_dtm",
 	}
 	name := "postgres " + datadir
 	c := make(chan string)
@@ -118,11 +120,30 @@ func check_bin(bin *map[string]string) {
 	}
 }
 
+func get_prefix(srcroot string) string {
+	makefile, err := os.Open(srcroot + "/src/Makefile.global")
+	if err != nil {
+		return "."
+	}
+
+	scanner := bufio.NewScanner(makefile)
+	for scanner.Scan() {
+		s := scanner.Text()
+		if strings.HasPrefix(s, "prefix := ") {
+			return strings.TrimPrefix(s, "prefix := ")
+		}
+	}
+	return "."
+}
+
 func main() {
+	srcroot := "../../.."
+	prefix := get_prefix(srcroot)
+
 	bin := map[string]string{
-		"dtmd": "/home/kvap/postgrespro/contrib/pg_xtm/dtmd/bin/dtmd",
-		"initdb": "/home/kvap/postgrespro-build/bin/initdb",
-		"postgres": "/home/kvap/postgrespro-build/bin/postgres",
+		"dtmd": srcroot + "/contrib/pg_dtm/dtmd/bin/dtmd",
+		"initdb": prefix + "/bin/initdb",
+		"postgres": prefix + "/bin/postgres",
 	}
 
 	datadirs := []string{"/tmp/data1", "/tmp/data2"}
