Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Unified Diff: third_party/sqlite/src/test/oserror.test

Issue 1610963002: Import SQLite 3.10.2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/sqlite/src/test/orderby9.test ('k') | third_party/sqlite/src/test/pagesize.test » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/sqlite/src/test/oserror.test
diff --git a/third_party/sqlite/src/test/oserror.test b/third_party/sqlite/src/test/oserror.test
index 40d2966bcca57409fdb25aeb58375261c9a4d6d3..5fa7f98eb5681f3277c4da1cd04e9cce5b0bfcb8 100644
--- a/third_party/sqlite/src/test/oserror.test
+++ b/third_party/sqlite/src/test/oserror.test
@@ -51,19 +51,20 @@ proc do_re_test {tn script expression} {
# a call to getcwd() may fail if there are no free file descriptors. So
# an error may be reported for either open() or getcwd() here.
#
-puts "Possible valgrind error about invalid file descriptor follows:"
-do_test 1.1.1 {
- set ::log [list]
- list [catch {
- for {set i 0} {$i < 2000} {incr i} { sqlite3 dbh_$i test.db -readonly 1 }
- } msg] $msg
-} {1 {unable to open database file}}
-do_test 1.1.2 {
- catch { for {set i 0} {$i < 2000} {incr i} { dbh_$i close } }
-} {1}
-do_re_test 1.1.3 {
- lindex $::log 0
-} {^os_unix.c:\d+: \(\d+\) (open|getcwd)\(.*test.db\) - }
+if {![clang_sanitize_address]} {
+ do_test 1.1.1 {
+ set ::log [list]
+ list [catch {
+ for {set i 0} {$i < 2000} {incr i} { sqlite3 dbh_$i test.db -readonly 1 }
+ } msg] $msg
+ } {1 {unable to open database file}}
+ do_test 1.1.2 {
+ catch { for {set i 0} {$i < 2000} {incr i} { dbh_$i close } }
+ } {1}
+ do_re_test 1.1.3 {
+ lindex $::log 0
+ } {^os_unix.c:\d+: \(\d+\) (open|getcwd)\(.*test.db\) - }
+}
# Test a failure in open() due to the path being a directory.
@@ -92,7 +93,9 @@ do_test 1.4.1 {
list [catch { sqlite3 dbh /root/test.db } msg] $msg
} {1 {unable to open database file}}
-do_re_test 1.4.2 { lindex $::log 0 } {^os_unix.c:\d*: \(\d+\) open\(.*test.db\) - }
+do_re_test 1.4.2 {
+ lindex $::log 0
+} {^os_unix.c:\d*: \(\d+\) (open|readlink)\(.*test.db\) - }
#--------------------------------------------------------------------------
# Tests oserror-1.* test failures in the unlink() system call.
« no previous file with comments | « third_party/sqlite/src/test/orderby9.test ('k') | third_party/sqlite/src/test/pagesize.test » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698