/ Check-in [64898485]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:The server1.test script should only run if mutexes are functional. Fix to the #ifdef change of check-in [9e6a4c1473].
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 6489848590db7088d965b7fa7feabc8c66e2e2b1
User & Date: drh 2011-08-31 19:40:58
Context
2011-08-31
20:47
Add the SQLITE_MAX_SCHEMA_RETRY compile-time option to the set of options understood by "PRAGMA compile_options;" and by the "sqlite_compileoption_used()" function. check-in: 1b124af4 user: drh tags: trunk
19:40
The server1.test script should only run if mutexes are functional. Fix to the #ifdef change of check-in [9e6a4c1473]. check-in: 64898485 user: drh tags: trunk
18:35
Always include the unixShm.id field, even when not debugging. check-in: 07803476 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/os_common.h.

25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
** macro to SQLITE_DEBUG and some older makefiles have not yet made the
** switch.  The following code should catch this problem at compile-time.
*/
#ifdef MEMORY_DEBUG
# error "The MEMORY_DEBUG macro is obsolete.  Use SQLITE_DEBUG instead."
#endif

#ifdef SQLITE_TEST
# ifndef SQLITE_DEBUG_OS_TRACE
#   define SQLITE_DEBUG_OS_TRACE 0
# endif
  int sqlite3OSTrace = SQLITE_DEBUG_OS_TRACE;
# define OSTRACE(X)          if( sqlite3OSTrace ) sqlite3DebugPrintf X
#else
# define OSTRACE(X)







|







25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
** macro to SQLITE_DEBUG and some older makefiles have not yet made the
** switch.  The following code should catch this problem at compile-time.
*/
#ifdef MEMORY_DEBUG
# error "The MEMORY_DEBUG macro is obsolete.  Use SQLITE_DEBUG instead."
#endif

#if defined(SQLITE_TEST) && defined(SQLITE_DEBUG)
# ifndef SQLITE_DEBUG_OS_TRACE
#   define SQLITE_DEBUG_OS_TRACE 0
# endif
  int sqlite3OSTrace = SQLITE_DEBUG_OS_TRACE;
# define OSTRACE(X)          if( sqlite3OSTrace ) sqlite3DebugPrintf X
#else
# define OSTRACE(X)

Changes to test/server1.test.

25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
  finish_test
  return
}

# The sample server implementation does not work right when memory
# management is enabled.
#
ifcapable memorymanage {
  finish_test
  return
}

# Create some data to work with
#
do_test server1-1.1 {







|







25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
  finish_test
  return
}

# The sample server implementation does not work right when memory
# management is enabled.
#
ifcapable (memorymanage||mutex_noop) {
  finish_test
  return
}

# Create some data to work with
#
do_test server1-1.1 {