File tree Expand file tree Collapse file tree 1 file changed +9
-4
lines changed Expand file tree Collapse file tree 1 file changed +9
-4
lines changed Original file line number Diff line number Diff line change 3333 postgresql_14
3434 postgresql_15
3535 postgresql_16
36- # postgresql_17
36+ postgresql_17
3737 ] ;
3838 testVersionCombos = pkgs . lib . cartesianProduct {
3939 python = testPythonVersions ;
144144 multicornPostgresExtension
145145 ] ) ;
146146 in pkgs . stdenv . mkDerivation {
147- name = "multicorn2-python-test" ;
147+ name = "multicorn2-python-test-pg ${ test_postgresql . version } -py ${ test_python . version } " ;
148148
149149 phases = [ "unpackPhase" "checkPhase" "installPhase" ] ;
150150 doCheck = true ;
190190 python -c "import multicorn"
191191
192192 set +e
193- make easycheck
193+ # PG17+ has a regression-test optimization to reduce initdb runs by doing initdb once and copying it to future
194+ # tests. However, it fails to work in this build environment -- `with_temp_install=""` disables that
195+ # optimization.
196+ make with_temp_install="" easycheck
194197 RESULT=$?
195198 set -e
196199 if [[ $RESULT -ne 0 ]]; then
197200 echo "easycheck failed"
198- cat /build/regression.diffs
201+ [[ -f /build/log/initdb.log ]] && cat /build/log/initdb.log
202+ [[ -f /build/log/postmaster.log ]] && cat /build/log/postmaster.log
203+ [[ -f /build/regression.diffs ]] && cat /build/regression.diffs
199204 exit $RESULT
200205 fi
201206
You can’t perform that action at this time.
0 commit comments