Fossil SCM
Allow fossil to be used together with SQLite 3.8.2 amalgamation. Add UTF16-be file for test-purposes. Disable (3-way) merge2 tests which use UTF16 files: 3-way merges with UTF16 files is not (yet) implemented.
Commit
7e9633a9b3f086c5adec9c2afd085038164cd16e
Parent
27ef534d48706f0…
3 files changed
+4
+1
+1
-1
+4
| --- src/report.c | ||
| +++ src/report.c | ||
| @@ -22,10 +22,14 @@ | ||
| 22 | 22 | #include "report.h" |
| 23 | 23 | #include <assert.h> |
| 24 | 24 | |
| 25 | 25 | /* Forward references to static routines */ |
| 26 | 26 | static void report_format_hints(void); |
| 27 | + | |
| 28 | +#ifndef SQLITE_RECURSIVE | |
| 29 | +# define SQLITE_RECURSIVE 33 | |
| 30 | +#endif | |
| 27 | 31 | |
| 28 | 32 | /* |
| 29 | 33 | ** WEBPAGE: /reportlist |
| 30 | 34 | */ |
| 31 | 35 | void view_list(void){ |
| 32 | 36 |
| --- src/report.c | |
| +++ src/report.c | |
| @@ -22,10 +22,14 @@ | |
| 22 | #include "report.h" |
| 23 | #include <assert.h> |
| 24 | |
| 25 | /* Forward references to static routines */ |
| 26 | static void report_format_hints(void); |
| 27 | |
| 28 | /* |
| 29 | ** WEBPAGE: /reportlist |
| 30 | */ |
| 31 | void view_list(void){ |
| 32 |
| --- src/report.c | |
| +++ src/report.c | |
| @@ -22,10 +22,14 @@ | |
| 22 | #include "report.h" |
| 23 | #include <assert.h> |
| 24 | |
| 25 | /* Forward references to static routines */ |
| 26 | static void report_format_hints(void); |
| 27 | |
| 28 | #ifndef SQLITE_RECURSIVE |
| 29 | # define SQLITE_RECURSIVE 33 |
| 30 | #endif |
| 31 | |
| 32 | /* |
| 33 | ** WEBPAGE: /reportlist |
| 34 | */ |
| 35 | void view_list(void){ |
| 36 |
+1
| --- test/merge2.test | ||
| +++ test/merge2.test | ||
| @@ -20,10 +20,11 @@ | ||
| 20 | 20 | |
| 21 | 21 | set filelist [glob $testdir/*] |
| 22 | 22 | foreach f $filelist { |
| 23 | 23 | if {[file isdir $f]} continue |
| 24 | 24 | set base [file root [file tail $f]] |
| 25 | + if {[string match "utf16*" $base]} continue | |
| 25 | 26 | set f1 [read_file $f] |
| 26 | 27 | write_file t1 $f1 |
| 27 | 28 | for {set i 0} {$i<100} {incr i} { |
| 28 | 29 | expr {srand($i*2)} |
| 29 | 30 | write_file t2 [set f2 [random_changes $f1 2 4 0 0.1]] |
| 30 | 31 |
| --- test/merge2.test | |
| +++ test/merge2.test | |
| @@ -20,10 +20,11 @@ | |
| 20 | |
| 21 | set filelist [glob $testdir/*] |
| 22 | foreach f $filelist { |
| 23 | if {[file isdir $f]} continue |
| 24 | set base [file root [file tail $f]] |
| 25 | set f1 [read_file $f] |
| 26 | write_file t1 $f1 |
| 27 | for {set i 0} {$i<100} {incr i} { |
| 28 | expr {srand($i*2)} |
| 29 | write_file t2 [set f2 [random_changes $f1 2 4 0 0.1]] |
| 30 |
| --- test/merge2.test | |
| +++ test/merge2.test | |
| @@ -20,10 +20,11 @@ | |
| 20 | |
| 21 | set filelist [glob $testdir/*] |
| 22 | foreach f $filelist { |
| 23 | if {[file isdir $f]} continue |
| 24 | set base [file root [file tail $f]] |
| 25 | if {[string match "utf16*" $base]} continue |
| 26 | set f1 [read_file $f] |
| 27 | write_file t1 $f1 |
| 28 | for {set i 0} {$i<100} {incr i} { |
| 29 | expr {srand($i*2)} |
| 30 | write_file t2 [set f2 [random_changes $f1 2 4 0 0.1]] |
| 31 |
+1
-1
| --- test/utf16le.txt | ||
| +++ test/utf16le.txt | ||
| @@ -1,6 +1,6 @@ | ||
| 1 | -This file contains utf-16le text. | |
| 1 | +This file contains utf-16be text. | |
| 2 | 2 | The purpose for including this file in the Fossil |
| 3 | 3 | repository is to provide the ability to test Fossil's |
| 4 | 4 | handling of UTF-16 using its own repository. |
| 5 | 5 | |
| 6 | 6 | Browsing to this file in the web interface should display the file as |
| 7 | 7 |
| --- test/utf16le.txt | |
| +++ test/utf16le.txt | |
| @@ -1,6 +1,6 @@ | |
| 1 | This file contains utf-16le text. |
| 2 | The purpose for including this file in the Fossil |
| 3 | repository is to provide the ability to test Fossil's |
| 4 | handling of UTF-16 using its own repository. |
| 5 | |
| 6 | Browsing to this file in the web interface should display the file as |
| 7 |
| --- test/utf16le.txt | |
| +++ test/utf16le.txt | |
| @@ -1,6 +1,6 @@ | |
| 1 | This file contains utf-16be text. |
| 2 | The purpose for including this file in the Fossil |
| 3 | repository is to provide the ability to test Fossil's |
| 4 | handling of UTF-16 using its own repository. |
| 5 | |
| 6 | Browsing to this file in the web interface should display the file as |
| 7 |