@@ -8,6 +8,8 @@ var pretty = require('prettysize');
8
8
var md5 = require ( "MD5" ) ;
9
9
var comparray = require ( 'comparray' ) ;
10
10
var sqllogictestparser = require ( __dirname + '/sqllogictestparserV2' ) ;
11
+ var numeral = require ( 'numeral' ) ; // var string = numeral(1000).format('0,0');
12
+
11
13
12
14
var alasql = require ( __dirname + '/../../alasql/dist/alasql' ) ; //todo: make parameter to set path
13
15
//var alasql = require('alasql');
@@ -57,7 +59,7 @@ var testfiles = walkFiles(
57
59
// /00\/|\d{2,}\.test/ // Exclude a lot of files (fastest - 125 files)
58
60
// /\/10+\// // exclude biggest files (balance between time and depth) (410 files)
59
61
// null // Exclude no files - As all tests contains a few million tests it can take some time. (622+ files)
60
- / s e l e c t 5 \. t e s t /
62
+ / s e l e c t 5 \. t e s t / // get all exept select5.test - as its taking days to complete
61
63
62
64
) ;
63
65
@@ -91,6 +93,7 @@ alasql.options.modifier = "MATRIX";
91
93
alasql . options . cache = false ;
92
94
var mimicking = 0 ;
93
95
var erroIndex = { } ;
96
+ var format = function ( val ) { return numeral ( val ) . format ( '0,0' ) }
94
97
var score = {
95
98
ok : {
96
99
total :0 ,
@@ -134,7 +137,7 @@ var score = {
134
137
135
138
136
139
137
- console . log ( '# SQLlogictest results for' , useSqliteDb ?'sql.js' :'AlaSQL ' + alasql . version ) ;
140
+ console . log ( '# SQLlogictest ' + ( onlyParseSql ? ' compile ' : '' ) + ' results for', useSqliteDb ?'sql.js' :'AlaSQL ' + alasql . version ) ;
138
141
console . log ( '' ) ;
139
142
console . log ( '_' + new Date ( ) . toISOString ( ) + '_' ) ;
140
143
console . log ( '' ) ;
@@ -201,16 +204,16 @@ for (var i in testfiles) {
201
204
if ( 0 === roundCount . total ) {
202
205
continue ;
203
206
}
204
-
205
- console . log ( '#### ' + ( 0 === roundCount . fail ?'★' :'☓' ) + ' Ran' , roundCount . total , 'tests as' , mimic [ mimicking ] ) ;
207
+ numeral ( 1000 ) . format ( '0,0' )
208
+ console . log ( '#### ' + ( 0 === roundCount . fail ?'★' :'☓' ) + ' Ran' , format ( roundCount . total ) , 'tests as' , mimic [ mimicking ] ) ;
206
209
console . log ( '' ) ;
207
210
208
211
if ( roundCount . skip ) {
209
- console . log ( '* ' + roundCount . skip + " skipped" ) ;
212
+ console . log ( '* ' + format ( roundCount . skip ) + " skipped" ) ;
210
213
}
211
214
212
215
if ( roundCount . fail ) {
213
- console . log ( '* ' + roundCount . fail + " failed" ) ;
216
+ console . log ( '* ' + format ( roundCount . fail ) + " failed" ) ;
214
217
}
215
218
216
219
@@ -252,12 +255,12 @@ function printStats(){
252
255
253
256
console . log ( '## Final result' ) ;
254
257
console . log ( '' ) ;
255
- console . log ( '* Skipped tests:' , score . skip . total ) ;
258
+ console . log ( '* Skipped tests:' , format ( score . skip . total ) ) ;
256
259
257
- console . log ( '* Failed tests:' , score . fail . total ) ;
260
+ console . log ( '* Failed tests:' , format ( score . fail . total ) ) ;
258
261
259
262
//console.log('Was OK :', score.ok.total);
260
- console . log ( '* Total tested:' , score . ok . total + score . fail . total + score . skip . total ) ;
263
+ console . log ( '* Total tested:' , format ( score . ok . total + score . fail . total + score . skip . total ) ) ;
261
264
console . log ( '* Final score:' , score . percent ( score . ok . total , score . fail . total + score . skip . total ) , '% was OK' ) ;
262
265
263
266
//printMem();
0 commit comments