Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ INSTALL_NAME = $(pkglibdir)/$(PKG_LIB_FILE)
#========================================================================

EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR)
TCLLIBPATH = $(top_builddir)
TCLLIBPATH ?= $(top_builddir)
TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library`
PKG_ENV = @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \
PATH="$(EXTRA_PATH):$(PATH)" \
Expand Down
7 changes: 3 additions & 4 deletions tests/all.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@ proc tcltest::cleanupTestsHook {} {

::tcltest::configure -testdir [file dirname [file normalize [info script]]]
::tcltest::configure {*}$argv
::tcltest::runAllTests
set testResult [::tcltest::runAllTests]


if {$exitCode == 1} {
if {$exitCode == 1 || $testResult == 1} {
puts "====== FAIL ====="
exit $exitCode
exit [expr {$exitCode || $testResult}]
} else {
puts "====== SUCCESS ====="
}
5 changes: 2 additions & 3 deletions tests/pgtcl-bulk.test
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,6 @@ test pgtcl-14.1 {comprehensive tests} -body {
return [pg_result $res -error]
}
pg_result $res -clear
puts -nonewline stderr "\r14.1.1 $i "
}
set result 0
for {set i 0} {$i < 10000} {incr i} {
Expand Down Expand Up @@ -386,9 +385,7 @@ test pgtcl-14.1 {comprehensive tests} -body {
incr result
}
pg_result $res -clear
puts -nonewline stderr "\r14.1.2 $i $result "
}
puts stderr "\r[list result $result] "
pg_disconnect $conn

list
Expand All @@ -405,3 +402,5 @@ pg_disconnect $conn


puts "tests complete"

cleanupTests
6 changes: 4 additions & 2 deletions tests/pgtcl.test
Original file line number Diff line number Diff line change
Expand Up @@ -1079,9 +1079,9 @@ test pgtcl-9.3 {dbinfo param} -body {
lappend res [string equal $val $val2]
::pg::disconnect $conn

set match [regexp {(7|8|9|10|11|12)\.([0-9])\.([0-9])} $val]
set match [regexp {(7|8|9|1[0-9])\.([0-9])\.([0-9])} $val]
if {!$match} {
set match [regexp {^(10|11|12)\.[1-9][0-9]* \(.*} $val]
set match [regexp {^(1[0-9])\.[1-9][0-9]*} $val]
}
lappend res $match

Expand Down Expand Up @@ -1363,3 +1363,5 @@ test pgtcl-11.3 {using pg_exec with 4-byte unicode positional args} -body {


puts "tests complete"

cleanupTests
2 changes: 1 addition & 1 deletion tests/sqlite3.test
Original file line number Diff line number Diff line change
Expand Up @@ -141,4 +141,4 @@ test pgtcl-sqlite3-1.4 {import postgresql result with multiple keys} -body {
expr {$pgtcl_count == $sqlite_count}
} -result 1


cleanupTests
Loading