git-ci: Fix some problems in CI scripts

vbwagner · vbwagner · commit 410aa2dc2e93 · 2017-01-06T18:07:33.000+03:00
diff --git a/.ci/build_and_test_world b/.ci/build_and_test_world
@@ -24,7 +24,7 @@ stage() {
 }
 
 # Dump logs on exit unless interactive
-[ "$1" = "-i" -o -z "$DESKTOP_SESSION" ]|| trap .ci/collect_logs EXIT
+[ "$1" = "-i" -o -n "$DESKTOP_SESSION" ]|| trap .ci/collect_logs EXIT
 set -e
 stage configure
 ./configure --enable-tap-tests --enable-debug --enable-cassert --enable-nls \
diff --git a/.ci/collect_logs b/.ci/collect_logs
@@ -23,7 +23,7 @@ for f in cores:
     gdb=subprocess.Popen(["gdb","src/backend/postgres",f],
         stderr=subprocess.PIPE,stdout=subprocess.PIPE,stdin=subprocess.PIPE)
     out,err=gdb.communicate("bt\nq\n")
-    if err.index("core file may not match specified")>=0:
+    if err.find("core file may not match specified")>=0:
         m=re.search("Core was generated by `(.*)'",out)
         if m:
             gdb=subprocess.Popen(["gdb",m.group(1),f],

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ stage() {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`# Dump logs on exit unless interactive`
`27`		`-[ "$1" = "-i" -o -z "$DESKTOP_SESSION" ]\|\| trap .ci/collect_logs EXIT`
	`27`	`+[ "$1" = "-i" -o -n "$DESKTOP_SESSION" ]\|\| trap .ci/collect_logs EXIT`
`28`	`28`	`set -e`
`29`	`29`	`stage configure`
`30`	`30`	`./configure --enable-tap-tests --enable-debug --enable-cassert --enable-nls \`