Merge pull request #618 from joergsteffens/dev/joergs/master/systemte…

…st-fix systemtest: when finding multiple psql binaries, select the first
bareos · Oct 15, 2020 · ae4667d · ae4667d
2 parents 6f1a66e + a6ebc10
commit ae4667d
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/systemtests/environment.in b/systemtests/environment.in
@@ -107,10 +107,11 @@ export PYTHON_EXECUTABLE=@PYTHON_EXECUTABLE@
 
 export OVIRT_SERVER=@ovirt_server@
 
-# real postgres binaries are hidden on debian, instead there are wrappers
-# which we do not want for our tests
+# Real postgres binaries are hidden on debian, instead there are wrappers
+# which we do not want for our tests.
+# If there are multiple version, select the first.
 if [ -d /usr/lib/postgresql  ]; then
-  POSTGRES_BINARY_DIR=$(dirname $(find -L /usr/lib/postgresql | grep psql))
+  POSTGRES_BINARY_DIR=$(dirname $(find -L /usr/lib/postgresql -name psql | sort | head -n 1))
   export PATH=$POSTGRES_BINARY_DIR:$PATH
 else
   export PATH=/sbin:/usr/sbin:$PATH