Fossil SCM

Merge fork

andygoth 2016-10-14 20:34 trunk merge
Commit 3a35ac58bbcd3f611e1b5740b99c6cbeae1713b3
Parent f8f5a8159ee934f…
4 files changed +3 -3 +1 -1 +15 -4 +3 -3
~ src/sqlite3.c ~ src/sqlite3.h ~ test/tester.tcl ~ test/unversioned.test
M src/sqlite3.c
+3 -3
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -381,11 +381,11 @@
381381
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
382382
 ** [sqlite_version()] and [sqlite_source_id()].
383383
 */
384384
 #define SQLITE_VERSION "3.15.0"
385385
 #define SQLITE_VERSION_NUMBER 3015000
386
-#define SQLITE_SOURCE_ID "2016-10-12 18:55:53 443913d582bcd953d85159047541592e2f68ade3"
386
+#define SQLITE_SOURCE_ID "2016-10-14 10:20:30 707875582fcba352b4906a595ad89198d84711d8"
387387
388388
 /*
389389
 ** CAPI3REF: Run-Time Library Version Numbers
390390
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
391391
 **
@@ -44715,11 +44715,11 @@
4471544715
 szBulk = pCache->szAlloc * (i64)pcache1.nInitPage;
4471644716
 }else{
4471744717
 szBulk = -1024 * (i64)pcache1.nInitPage;
4471844718
 }
4471944719
 if( szBulk > pCache->szAlloc*(i64)pCache->nMax ){
44720
- szBulk = pCache->szAlloc*pCache->nMax;
44720
+ szBulk = pCache->szAlloc*(i64)pCache->nMax;
4472144721
 }
4472244722
 zBulk = pCache->pBulk = sqlite3Malloc( szBulk );
4472344723
 sqlite3EndBenignMalloc();
4472444724
 if( zBulk ){
4472544725
 int nBulk = sqlite3MallocSize(zBulk)/pCache->szAlloc;
@@ -195596,11 +195596,11 @@
195596195596
 int nArg, /* Number of args */
195597195597
 sqlite3_value **apUnused /* Function arguments */
195598195598
 ){
195599195599
 assert( nArg==0 );
195600195600
 UNUSED_PARAM2(nArg, apUnused);
195601
- sqlite3_result_text(pCtx, "fts5: 2016-10-12 18:55:53 443913d582bcd953d85159047541592e2f68ade3", -1, SQLITE_TRANSIENT);
195601
+ sqlite3_result_text(pCtx, "fts5: 2016-10-14 10:20:30 707875582fcba352b4906a595ad89198d84711d8", -1, SQLITE_TRANSIENT);
195602195602
 }
195603195603
195604195604
 static int fts5Init(sqlite3 *db){
195605195605
 static const sqlite3_module fts5Mod = {
195606195606
 /* iVersion */ 2,
195607195607
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -381,11 +381,11 @@
381 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
382 ** [sqlite_version()] and [sqlite_source_id()].
383 */
384 #define SQLITE_VERSION "3.15.0"
385 #define SQLITE_VERSION_NUMBER 3015000
386 #define SQLITE_SOURCE_ID "2016-10-12 18:55:53 443913d582bcd953d85159047541592e2f68ade3"
387
388 /*
389 ** CAPI3REF: Run-Time Library Version Numbers
390 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
391 **
@@ -44715,11 +44715,11 @@
44715 szBulk = pCache->szAlloc * (i64)pcache1.nInitPage;
44716 }else{
44717 szBulk = -1024 * (i64)pcache1.nInitPage;
44718 }
44719 if( szBulk > pCache->szAlloc*(i64)pCache->nMax ){
44720 szBulk = pCache->szAlloc*pCache->nMax;
44721 }
44722 zBulk = pCache->pBulk = sqlite3Malloc( szBulk );
44723 sqlite3EndBenignMalloc();
44724 if( zBulk ){
44725 int nBulk = sqlite3MallocSize(zBulk)/pCache->szAlloc;
@@ -195596,11 +195596,11 @@
195596 int nArg, /* Number of args */
195597 sqlite3_value **apUnused /* Function arguments */
195598 ){
195599 assert( nArg==0 );
195600 UNUSED_PARAM2(nArg, apUnused);
195601 sqlite3_result_text(pCtx, "fts5: 2016-10-12 18:55:53 443913d582bcd953d85159047541592e2f68ade3", -1, SQLITE_TRANSIENT);
195602 }
195603
195604 static int fts5Init(sqlite3 *db){
195605 static const sqlite3_module fts5Mod = {
195606 /* iVersion */ 2,
195607
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -381,11 +381,11 @@
381 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
382 ** [sqlite_version()] and [sqlite_source_id()].
383 */
384 #define SQLITE_VERSION "3.15.0"
385 #define SQLITE_VERSION_NUMBER 3015000
386 #define SQLITE_SOURCE_ID "2016-10-14 10:20:30 707875582fcba352b4906a595ad89198d84711d8"
387
388 /*
389 ** CAPI3REF: Run-Time Library Version Numbers
390 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
391 **
@@ -44715,11 +44715,11 @@
44715 szBulk = pCache->szAlloc * (i64)pcache1.nInitPage;
44716 }else{
44717 szBulk = -1024 * (i64)pcache1.nInitPage;
44718 }
44719 if( szBulk > pCache->szAlloc*(i64)pCache->nMax ){
44720 szBulk = pCache->szAlloc*(i64)pCache->nMax;
44721 }
44722 zBulk = pCache->pBulk = sqlite3Malloc( szBulk );
44723 sqlite3EndBenignMalloc();
44724 if( zBulk ){
44725 int nBulk = sqlite3MallocSize(zBulk)/pCache->szAlloc;
@@ -195596,11 +195596,11 @@
195596 int nArg, /* Number of args */
195597 sqlite3_value **apUnused /* Function arguments */
195598 ){
195599 assert( nArg==0 );
195600 UNUSED_PARAM2(nArg, apUnused);
195601 sqlite3_result_text(pCtx, "fts5: 2016-10-14 10:20:30 707875582fcba352b4906a595ad89198d84711d8", -1, SQLITE_TRANSIENT);
195602 }
195603
195604 static int fts5Init(sqlite3 *db){
195605 static const sqlite3_module fts5Mod = {
195606 /* iVersion */ 2,
195607
M src/sqlite3.h
+1 -1
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -121,11 +121,11 @@
121121
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
122122
 ** [sqlite_version()] and [sqlite_source_id()].
123123
 */
124124
 #define SQLITE_VERSION "3.15.0"
125125
 #define SQLITE_VERSION_NUMBER 3015000
126
-#define SQLITE_SOURCE_ID "2016-10-12 18:55:53 443913d582bcd953d85159047541592e2f68ade3"
126
+#define SQLITE_SOURCE_ID "2016-10-14 10:20:30 707875582fcba352b4906a595ad89198d84711d8"
127127
128128
 /*
129129
 ** CAPI3REF: Run-Time Library Version Numbers
130130
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
131131
 **
132132
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -121,11 +121,11 @@
121 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
122 ** [sqlite_version()] and [sqlite_source_id()].
123 */
124 #define SQLITE_VERSION "3.15.0"
125 #define SQLITE_VERSION_NUMBER 3015000
126 #define SQLITE_SOURCE_ID "2016-10-12 18:55:53 443913d582bcd953d85159047541592e2f68ade3"
127
128 /*
129 ** CAPI3REF: Run-Time Library Version Numbers
130 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
131 **
132
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -121,11 +121,11 @@
121 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
122 ** [sqlite_version()] and [sqlite_source_id()].
123 */
124 #define SQLITE_VERSION "3.15.0"
125 #define SQLITE_VERSION_NUMBER 3015000
126 #define SQLITE_SOURCE_ID "2016-10-14 10:20:30 707875582fcba352b4906a595ad89198d84711d8"
127
128 /*
129 ** CAPI3REF: Run-Time Library Version Numbers
130 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
131 **
132
M test/tester.tcl
+15 -4
--- test/tester.tcl
+++ test/tester.tcl
@@ -749,30 +749,41 @@
749749
 }
750750
 return [string range $out 1 end]
751751
 }
752752
753753
 # This procedure executes the "fossil server" command. The return value
754
-# is the new process identifier. The varName argument refers to a variable
754
+# is a list comprised of the new process identifier and the port on which
755
+# the server started. The varName argument refers to a variable
755756
 # where the "stop argument" is to be stored. This value must eventually be
756757
 # passed to the [test_stop_server] procedure.
757758
 proc test_start_server { repository {varName ""} } {
758
- global fossilexe
759
+ global fossilexe tempPath
759760
 set command [list exec $fossilexe server]
760761
 if {[string length $varName] > 0} {
761762
 upvar 1 $varName stopArg
762763
 }
763764
 if {$::tcl_platform(platform) eq "windows"} {
764765
 set stopArg [file join [getTemporaryPath] [appendArgs \
765766
 [string trim [clock seconds] -] _ [getSeqNo] .stopper]]
766767
 lappend command --stopper $stopArg
767768
 }
768
- lappend command $repository &
769
+ set outFileName [file join $tempPath [appendArgs \
770
+ fossil_server_ [string trim [clock seconds] -] _ \
771
+ [getSeqNo]]].out
772
+ lappend command $repository >&$outFileName &
769773
 set pid [eval $command]
770774
 if {$::tcl_platform(platform) ne "windows"} {
771775
 set stopArg $pid
772776
 }
773
- return $pid
777
+ after 1000; # output might not be there yet
778
+ set output [read_file $outFileName]
779
+ catch {file delete $outFileName}
780
+ if {![regexp {Listening.*TCP port (\d+)} $output dummy port]} {
781
+ puts stdout "Could not detect Fossil server port, using default..."
782
+ set port 8080; # return the default port just in case
783
+ }
784
+ return [list $pid $port]
774785
 }
775786
776787
 # This procedure stops a Fossil server instance that was previously started
777788
 # by the [test_start_server] procedure. The value of the "stop argument"
778789
 # will vary by platform as will the exact method used to stop the server.
779790
--- test/tester.tcl
+++ test/tester.tcl
@@ -749,30 +749,41 @@
749 }
750 return [string range $out 1 end]
751 }
752
753 # This procedure executes the "fossil server" command. The return value
754 # is the new process identifier. The varName argument refers to a variable
 
755 # where the "stop argument" is to be stored. This value must eventually be
756 # passed to the [test_stop_server] procedure.
757 proc test_start_server { repository {varName ""} } {
758 global fossilexe
759 set command [list exec $fossilexe server]
760 if {[string length $varName] > 0} {
761 upvar 1 $varName stopArg
762 }
763 if {$::tcl_platform(platform) eq "windows"} {
764 set stopArg [file join [getTemporaryPath] [appendArgs \
765 [string trim [clock seconds] -] _ [getSeqNo] .stopper]]
766 lappend command --stopper $stopArg
767 }
768 lappend command $repository &
 
 
 
769 set pid [eval $command]
770 if {$::tcl_platform(platform) ne "windows"} {
771 set stopArg $pid
772 }
773 return $pid
 
 
 
 
 
 
 
774 }
775
776 # This procedure stops a Fossil server instance that was previously started
777 # by the [test_start_server] procedure. The value of the "stop argument"
778 # will vary by platform as will the exact method used to stop the server.
779
--- test/tester.tcl
+++ test/tester.tcl
@@ -749,30 +749,41 @@
749 }
750 return [string range $out 1 end]
751 }
752
753 # This procedure executes the "fossil server" command. The return value
754 # is a list comprised of the new process identifier and the port on which
755 # the server started. The varName argument refers to a variable
756 # where the "stop argument" is to be stored. This value must eventually be
757 # passed to the [test_stop_server] procedure.
758 proc test_start_server { repository {varName ""} } {
759 global fossilexe tempPath
760 set command [list exec $fossilexe server]
761 if {[string length $varName] > 0} {
762 upvar 1 $varName stopArg
763 }
764 if {$::tcl_platform(platform) eq "windows"} {
765 set stopArg [file join [getTemporaryPath] [appendArgs \
766 [string trim [clock seconds] -] _ [getSeqNo] .stopper]]
767 lappend command --stopper $stopArg
768 }
769 set outFileName [file join $tempPath [appendArgs \
770 fossil_server_ [string trim [clock seconds] -] _ \
771 [getSeqNo]]].out
772 lappend command $repository >&$outFileName &
773 set pid [eval $command]
774 if {$::tcl_platform(platform) ne "windows"} {
775 set stopArg $pid
776 }
777 after 1000; # output might not be there yet
778 set output [read_file $outFileName]
779 catch {file delete $outFileName}
780 if {![regexp {Listening.*TCP port (\d+)} $output dummy port]} {
781 puts stdout "Could not detect Fossil server port, using default..."
782 set port 8080; # return the default port just in case
783 }
784 return [list $pid $port]
785 }
786
787 # This procedure stops a Fossil server instance that was previously started
788 # by the [test_start_server] procedure. The value of the "stop argument"
789 # will vary by platform as will the exact method used to stop the server.
790
M test/unversioned.test
+3 -3
--- test/unversioned.test
+++ test/unversioned.test
@@ -305,19 +305,19 @@
305305
 unversioned5\.txt$} [normalize_result]]}
306306
307307
 ###############################################################################
308308
309309
 set password [string trim [clock seconds] -]
310
-set remote [appendArgs http://uvtester: $password @localhost:8080/]
311310
312311
 fossil user new uvtester "Unversioned Test User" $password
313312
 fossil user capabilities uvtester oy
314313
315314
 ###############################################################################
316315
317
-set pid [test_start_server $repository stopArg]
318
-puts [appendArgs "Started Fossil server, pid \"" $pid \".]
316
+foreach {pid port} [test_start_server $repository stopArg] {}
317
+puts [appendArgs "Started Fossil server, pid \"" $pid \" ", port \"" $port \".]
318
+set remote [appendArgs http://uvtester: $password @localhost: $port /]
319319
320320
 ###############################################################################
321321
322322
 set clientDir [file join $tempPath [appendArgs \
323323
 uvtest_ [string trim [clock seconds] -] _ [getSeqNo]]]
324324
--- test/unversioned.test
+++ test/unversioned.test
@@ -305,19 +305,19 @@
305 unversioned5\.txt$} [normalize_result]]}
306
307 ###############################################################################
308
309 set password [string trim [clock seconds] -]
310 set remote [appendArgs http://uvtester: $password @localhost:8080/]
311
312 fossil user new uvtester "Unversioned Test User" $password
313 fossil user capabilities uvtester oy
314
315 ###############################################################################
316
317 set pid [test_start_server $repository stopArg]
318 puts [appendArgs "Started Fossil server, pid \"" $pid \".]
 
319
320 ###############################################################################
321
322 set clientDir [file join $tempPath [appendArgs \
323 uvtest_ [string trim [clock seconds] -] _ [getSeqNo]]]
324
--- test/unversioned.test
+++ test/unversioned.test
@@ -305,19 +305,19 @@
305 unversioned5\.txt$} [normalize_result]]}
306
307 ###############################################################################
308
309 set password [string trim [clock seconds] -]
 
310
311 fossil user new uvtester "Unversioned Test User" $password
312 fossil user capabilities uvtester oy
313
314 ###############################################################################
315
316 foreach {pid port} [test_start_server $repository stopArg] {}
317 puts [appendArgs "Started Fossil server, pid \"" $pid \" ", port \"" $port \".]
318 set remote [appendArgs http://uvtester: $password @localhost: $port /]
319
320 ###############################################################################
321
322 set clientDir [file join $tempPath [appendArgs \
323 uvtest_ [string trim [clock seconds] -] _ [getSeqNo]]]
324

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button