mirror of https://github.com/postgres/postgres
The meson and the make scripts had diverged a lot, so this commit fixes that plus some other inconsistencies.pull/220/head
parent
712dcf5976
commit
e979ab71c2
@ -1,8 +1,21 @@ |
||||
#!/bin/bash |
||||
|
||||
ENABLE_COVERAGE= |
||||
|
||||
for arg in "$@" |
||||
do |
||||
case "$arg" in |
||||
--enable-coverage) |
||||
ENABLE_COVERAGE="-Db_coverage=true" |
||||
shift;; |
||||
esac |
||||
done |
||||
|
||||
SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)" |
||||
INSTALL_DIR="$SCRIPT_DIR/../../pginst" |
||||
source "$SCRIPT_DIR/env.sh" |
||||
|
||||
cd "$SCRIPT_DIR/.." |
||||
|
||||
meson setup build --prefix `pwd`/../pginst --buildtype=$1 -Dcassert=true -Dtap_tests=enabled |
||||
meson setup build --prefix "$INSTALL_DIR" --buildtype="$1" -Dcassert=true -Dtap_tests=enabled $ENABLE_COVERAGE |
||||
cd build && ninja && ninja install |
||||
|
@ -1,7 +1,25 @@ |
||||
#!/bin/bash |
||||
|
||||
set -e |
||||
TDE_ONLY=0 |
||||
|
||||
for arg in "$@" |
||||
do |
||||
case "$arg" in |
||||
--tde-only) |
||||
TDE_ONLY=1 |
||||
shift;; |
||||
esac |
||||
done |
||||
|
||||
SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)" |
||||
source "$SCRIPT_DIR/env.sh" |
||||
|
||||
cd "$SCRIPT_DIR/../build" |
||||
|
||||
meson test |
||||
if [ "$TDE_ONLY" -eq 1 ]; |
||||
then |
||||
meson test --suite setup --suite pg_tde |
||||
else |
||||
meson test |
||||
fi |
||||
|
Loading…
Reference in new issue