Mercurial > hg > sonic-annotator
changeset 207:e8f2f530c091
Add & test the digits option in the CSV file writer
| author | Chris Cannam |
|---|---|
| date | Tue, 03 Nov 2015 14:31:59 +0000 |
| parents | 704a8b27f3ed |
| children | c17b184c16db |
| files | .hgsubstate tests/test-csv-writer/expected/grid-oss-0.csv tests/test-csv-writer/expected/grid-oss-2.csv tests/test-csv-writer/expected/grid-oss-6.csv tests/test-csv-writer/expected/grid-oss-all.csv tests/test-csv-writer/expected/grid-oss-end-times.csv tests/test-csv-writer/expected/grid-oss-fill-ends.csv tests/test-csv-writer/expected/grid-oss-no-flags.csv tests/test-csv-writer/expected/grid-oss-sample-timing.csv tests/test-csv-writer/expected/grid-oss-separator.csv tests/test-csv-writer/test-csv-writer.sh tests/test-lab-writer/test-lab-writer.sh |
| diffstat | 12 files changed, 197 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Tue Nov 03 13:42:11 2015 +0000 +++ b/.hgsubstate Tue Nov 03 14:31:59 2015 +0000 @@ -1,4 +1,4 @@ d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds -99acfd2d9f5dea40e94b6a4f2a1050acffde9222 svcore +870acd589a38f7cc100f32728002448291fbe393 svcore 632d90c185ecc8655f7a85ba58dc568351449dfd vamp-plugin-sdk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-csv-writer/expected/grid-oss-0.csv Tue Nov 03 14:31:59 2015 +0000 @@ -0,0 +1,20 @@ +"./../audio/20sec-silence.wav",0.000000000,0.0666667,0.1,0.133333,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,"1 of 20 at 0" +,0.023219954,0.1,0.133333,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,"2 of 20 at 0.023" +,0.046439909,0.133333,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,"3 of 20 at 0.046" +,0.069659863,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,"4 of 20 at 0.069" +,0.092879818,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,"5 of 20 at 0.092" +,0.116099773,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,"6 of 20 at 0.116" +,0.139319727,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,"7 of 20 at 0.139" +,0.162539682,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,"8 of 20 at 0.162" +,0.185759637,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,"9 of 20 at 0.185" +,0.208979591,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,"10 of 20 at 0.208" +,0.232199546,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,"11 of 20 at 0.232" +,0.255419501,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,"12 of 20 at 0.255" +,0.278639455,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,"13 of 20 at 0.278" +,0.301859410,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,"14 of 20 at 0.301" +,0.325079365,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,"15 of 20 at 0.325" +,0.348299319,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,"16 of 20 at 0.348" +,0.371519274,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,"17 of 20 at 0.371" +,0.394739229,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,0.933333,"18 of 20 at 0.394" +,0.417959183,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,0.933333,0.966667,"19 of 20 at 0.417" +,0.441179138,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,0.933333,0.966667,1,"20 of 20 at 0.441"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-csv-writer/expected/grid-oss-2.csv Tue Nov 03 14:31:59 2015 +0000 @@ -0,0 +1,20 @@ +"./../audio/20sec-silence.wav",0.000000000,0.067,0.1,0.13,0.17,0.2,0.23,0.27,0.3,0.33,0.37,"1 of 20 at 0" +,0.023219954,0.1,0.13,0.17,0.2,0.23,0.27,0.3,0.33,0.37,0.4,"2 of 20 at 0.023" +,0.046439909,0.13,0.17,0.2,0.23,0.27,0.3,0.33,0.37,0.4,0.43,"3 of 20 at 0.046" +,0.069659863,0.17,0.2,0.23,0.27,0.3,0.33,0.37,0.4,0.43,0.47,"4 of 20 at 0.069" +,0.092879818,0.2,0.23,0.27,0.3,0.33,0.37,0.4,0.43,0.47,0.5,"5 of 20 at 0.092" +,0.116099773,0.23,0.27,0.3,0.33,0.37,0.4,0.43,0.47,0.5,0.53,"6 of 20 at 0.116" +,0.139319727,0.27,0.3,0.33,0.37,0.4,0.43,0.47,0.5,0.53,0.57,"7 of 20 at 0.139" +,0.162539682,0.3,0.33,0.37,0.4,0.43,0.47,0.5,0.53,0.57,0.6,"8 of 20 at 0.162" +,0.185759637,0.33,0.37,0.4,0.43,0.47,0.5,0.53,0.57,0.6,0.63,"9 of 20 at 0.185" +,0.208979591,0.37,0.4,0.43,0.47,0.5,0.53,0.57,0.6,0.63,0.67,"10 of 20 at 0.208" +,0.232199546,0.4,0.43,0.47,0.5,0.53,0.57,0.6,0.63,0.67,0.7,"11 of 20 at 0.232" +,0.255419501,0.43,0.47,0.5,0.53,0.57,0.6,0.63,0.67,0.7,0.73,"12 of 20 at 0.255" +,0.278639455,0.47,0.5,0.53,0.57,0.6,0.63,0.67,0.7,0.73,0.77,"13 of 20 at 0.278" +,0.301859410,0.5,0.53,0.57,0.6,0.63,0.67,0.7,0.73,0.77,0.8,"14 of 20 at 0.301" +,0.325079365,0.53,0.57,0.6,0.63,0.67,0.7,0.73,0.77,0.8,0.83,"15 of 20 at 0.325" +,0.348299319,0.57,0.6,0.63,0.67,0.7,0.73,0.77,0.8,0.83,0.87,"16 of 20 at 0.348" +,0.371519274,0.6,0.63,0.67,0.7,0.73,0.77,0.8,0.83,0.87,0.9,"17 of 20 at 0.371" +,0.394739229,0.63,0.67,0.7,0.73,0.77,0.8,0.83,0.87,0.9,0.93,"18 of 20 at 0.394" +,0.417959183,0.67,0.7,0.73,0.77,0.8,0.83,0.87,0.9,0.93,0.97,"19 of 20 at 0.417" +,0.441179138,0.7,0.73,0.77,0.8,0.83,0.87,0.9,0.93,0.97,1,"20 of 20 at 0.441"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-csv-writer/expected/grid-oss-6.csv Tue Nov 03 14:31:59 2015 +0000 @@ -0,0 +1,20 @@ +"./../audio/20sec-silence.wav",0.000000000,0.0666667,0.1,0.133333,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,"1 of 20 at 0" +,0.023219954,0.1,0.133333,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,"2 of 20 at 0.023" +,0.046439909,0.133333,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,"3 of 20 at 0.046" +,0.069659863,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,"4 of 20 at 0.069" +,0.092879818,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,"5 of 20 at 0.092" +,0.116099773,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,"6 of 20 at 0.116" +,0.139319727,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,"7 of 20 at 0.139" +,0.162539682,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,"8 of 20 at 0.162" +,0.185759637,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,"9 of 20 at 0.185" +,0.208979591,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,"10 of 20 at 0.208" +,0.232199546,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,"11 of 20 at 0.232" +,0.255419501,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,"12 of 20 at 0.255" +,0.278639455,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,"13 of 20 at 0.278" +,0.301859410,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,"14 of 20 at 0.301" +,0.325079365,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,"15 of 20 at 0.325" +,0.348299319,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,"16 of 20 at 0.348" +,0.371519274,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,"17 of 20 at 0.371" +,0.394739229,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,0.933333,"18 of 20 at 0.394" +,0.417959183,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,0.933333,0.966667,"19 of 20 at 0.417" +,0.441179138,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,0.933333,0.966667,1,"20 of 20 at 0.441"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-csv-writer/expected/grid-oss-all.csv Tue Nov 03 14:31:59 2015 +0000 @@ -0,0 +1,20 @@ +"./../audio/20sec-silence.wav"@0@1024@0.0666667@0.1@0.133333@0.166667@0.2@0.233333@0.266667@0.3@0.333333@0.366667@"1 of 20 at 0" +@1024@2048@0.1@0.133333@0.166667@0.2@0.233333@0.266667@0.3@0.333333@0.366667@0.4@"2 of 20 at 0.023" +@2048@3072@0.133333@0.166667@0.2@0.233333@0.266667@0.3@0.333333@0.366667@0.4@0.433333@"3 of 20 at 0.046" +@3072@4096@0.166667@0.2@0.233333@0.266667@0.3@0.333333@0.366667@0.4@0.433333@0.466667@"4 of 20 at 0.069" +@4096@5120@0.2@0.233333@0.266667@0.3@0.333333@0.366667@0.4@0.433333@0.466667@0.5@"5 of 20 at 0.092" +@5120@6144@0.233333@0.266667@0.3@0.333333@0.366667@0.4@0.433333@0.466667@0.5@0.533333@"6 of 20 at 0.116" +@6144@7168@0.266667@0.3@0.333333@0.366667@0.4@0.433333@0.466667@0.5@0.533333@0.566667@"7 of 20 at 0.139" +@7168@8192@0.3@0.333333@0.366667@0.4@0.433333@0.466667@0.5@0.533333@0.566667@0.6@"8 of 20 at 0.162" +@8192@9216@0.333333@0.366667@0.4@0.433333@0.466667@0.5@0.533333@0.566667@0.6@0.633333@"9 of 20 at 0.185" +@9216@10240@0.366667@0.4@0.433333@0.466667@0.5@0.533333@0.566667@0.6@0.633333@0.666667@"10 of 20 at 0.208" +@10240@11264@0.4@0.433333@0.466667@0.5@0.533333@0.566667@0.6@0.633333@0.666667@0.7@"11 of 20 at 0.232" +@11264@12288@0.433333@0.466667@0.5@0.533333@0.566667@0.6@0.633333@0.666667@0.7@0.733333@"12 of 20 at 0.255" +@12288@13312@0.466667@0.5@0.533333@0.566667@0.6@0.633333@0.666667@0.7@0.733333@0.766667@"13 of 20 at 0.278" +@13312@14336@0.5@0.533333@0.566667@0.6@0.633333@0.666667@0.7@0.733333@0.766667@0.8@"14 of 20 at 0.301" +@14336@15360@0.533333@0.566667@0.6@0.633333@0.666667@0.7@0.733333@0.766667@0.8@0.833333@"15 of 20 at 0.325" +@15360@16384@0.566667@0.6@0.633333@0.666667@0.7@0.733333@0.766667@0.8@0.833333@0.866667@"16 of 20 at 0.348" +@16384@17408@0.6@0.633333@0.666667@0.7@0.733333@0.766667@0.8@0.833333@0.866667@0.9@"17 of 20 at 0.371" +@17408@18432@0.633333@0.666667@0.7@0.733333@0.766667@0.8@0.833333@0.866667@0.9@0.933333@"18 of 20 at 0.394" +@18432@19456@0.666667@0.7@0.733333@0.766667@0.8@0.833333@0.866667@0.9@0.933333@0.966667@"19 of 20 at 0.417" +@19456@19456@0.7@0.733333@0.766667@0.8@0.833333@0.866667@0.9@0.933333@0.966667@1@"20 of 20 at 0.441"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-csv-writer/expected/grid-oss-end-times.csv Tue Nov 03 14:31:59 2015 +0000 @@ -0,0 +1,20 @@ +"./../audio/20sec-silence.wav",0.000000000,0.0666667,0.1,0.133333,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,"1 of 20 at 0" +,0.023219954,0.1,0.133333,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,"2 of 20 at 0.023" +,0.046439909,0.133333,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,"3 of 20 at 0.046" +,0.069659863,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,"4 of 20 at 0.069" +,0.092879818,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,"5 of 20 at 0.092" +,0.116099773,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,"6 of 20 at 0.116" +,0.139319727,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,"7 of 20 at 0.139" +,0.162539682,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,"8 of 20 at 0.162" +,0.185759637,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,"9 of 20 at 0.185" +,0.208979591,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,"10 of 20 at 0.208" +,0.232199546,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,"11 of 20 at 0.232" +,0.255419501,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,"12 of 20 at 0.255" +,0.278639455,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,"13 of 20 at 0.278" +,0.301859410,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,"14 of 20 at 0.301" +,0.325079365,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,"15 of 20 at 0.325" +,0.348299319,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,"16 of 20 at 0.348" +,0.371519274,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,"17 of 20 at 0.371" +,0.394739229,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,0.933333,"18 of 20 at 0.394" +,0.417959183,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,0.933333,0.966667,"19 of 20 at 0.417" +,0.441179138,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,0.933333,0.966667,1,"20 of 20 at 0.441"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-csv-writer/expected/grid-oss-fill-ends.csv Tue Nov 03 14:31:59 2015 +0000 @@ -0,0 +1,20 @@ +"./../audio/20sec-silence.wav",0.000000000,0.023219954,0.0666667,0.1,0.133333,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,"1 of 20 at 0" +,0.023219954,0.023219955,0.1,0.133333,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,"2 of 20 at 0.023" +,0.046439909,0.023219954,0.133333,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,"3 of 20 at 0.046" +,0.069659863,0.023219955,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,"4 of 20 at 0.069" +,0.092879818,0.023219955,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,"5 of 20 at 0.092" +,0.116099773,0.023219954,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,"6 of 20 at 0.116" +,0.139319727,0.023219955,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,"7 of 20 at 0.139" +,0.162539682,0.023219955,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,"8 of 20 at 0.162" +,0.185759637,0.023219954,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,"9 of 20 at 0.185" +,0.208979591,0.023219955,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,"10 of 20 at 0.208" +,0.232199546,0.023219955,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,"11 of 20 at 0.232" +,0.255419501,0.023219954,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,"12 of 20 at 0.255" +,0.278639455,0.023219955,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,"13 of 20 at 0.278" +,0.301859410,0.023219955,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,"14 of 20 at 0.301" +,0.325079365,0.023219954,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,"15 of 20 at 0.325" +,0.348299319,0.023219955,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,"16 of 20 at 0.348" +,0.371519274,0.023219955,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,"17 of 20 at 0.371" +,0.394739229,0.023219954,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,0.933333,"18 of 20 at 0.394" +,0.417959183,0.023219955,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,0.933333,0.966667,"19 of 20 at 0.417" +,0.441179138,0.000000000,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,0.933333,0.966667,1,"20 of 20 at 0.441"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-csv-writer/expected/grid-oss-no-flags.csv Tue Nov 03 14:31:59 2015 +0000 @@ -0,0 +1,20 @@ +"./../audio/20sec-silence.wav",0.000000000,0.0666667,0.1,0.133333,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,"1 of 20 at 0" +,0.023219954,0.1,0.133333,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,"2 of 20 at 0.023" +,0.046439909,0.133333,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,"3 of 20 at 0.046" +,0.069659863,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,"4 of 20 at 0.069" +,0.092879818,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,"5 of 20 at 0.092" +,0.116099773,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,"6 of 20 at 0.116" +,0.139319727,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,"7 of 20 at 0.139" +,0.162539682,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,"8 of 20 at 0.162" +,0.185759637,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,"9 of 20 at 0.185" +,0.208979591,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,"10 of 20 at 0.208" +,0.232199546,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,"11 of 20 at 0.232" +,0.255419501,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,"12 of 20 at 0.255" +,0.278639455,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,"13 of 20 at 0.278" +,0.301859410,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,"14 of 20 at 0.301" +,0.325079365,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,"15 of 20 at 0.325" +,0.348299319,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,"16 of 20 at 0.348" +,0.371519274,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,"17 of 20 at 0.371" +,0.394739229,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,0.933333,"18 of 20 at 0.394" +,0.417959183,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,0.933333,0.966667,"19 of 20 at 0.417" +,0.441179138,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,0.933333,0.966667,1,"20 of 20 at 0.441"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-csv-writer/expected/grid-oss-sample-timing.csv Tue Nov 03 14:31:59 2015 +0000 @@ -0,0 +1,20 @@ +"./../audio/20sec-silence.wav",0,0.0666667,0.1,0.133333,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,"1 of 20 at 0" +,1024,0.1,0.133333,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,"2 of 20 at 0.023" +,2048,0.133333,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,"3 of 20 at 0.046" +,3072,0.166667,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,"4 of 20 at 0.069" +,4096,0.2,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,"5 of 20 at 0.092" +,5120,0.233333,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,"6 of 20 at 0.116" +,6144,0.266667,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,"7 of 20 at 0.139" +,7168,0.3,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,"8 of 20 at 0.162" +,8192,0.333333,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,"9 of 20 at 0.185" +,9216,0.366667,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,"10 of 20 at 0.208" +,10240,0.4,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,"11 of 20 at 0.232" +,11264,0.433333,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,"12 of 20 at 0.255" +,12288,0.466667,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,"13 of 20 at 0.278" +,13312,0.5,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,"14 of 20 at 0.301" +,14336,0.533333,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,"15 of 20 at 0.325" +,15360,0.566667,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,"16 of 20 at 0.348" +,16384,0.6,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,"17 of 20 at 0.371" +,17408,0.633333,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,0.933333,"18 of 20 at 0.394" +,18432,0.666667,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,0.933333,0.966667,"19 of 20 at 0.417" +,19456,0.7,0.733333,0.766667,0.8,0.833333,0.866667,0.9,0.933333,0.966667,1,"20 of 20 at 0.441"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-csv-writer/expected/grid-oss-separator.csv Tue Nov 03 14:31:59 2015 +0000 @@ -0,0 +1,20 @@ +"./../audio/20sec-silence.wav"@0.000000000@0.0666667@0.1@0.133333@0.166667@0.2@0.233333@0.266667@0.3@0.333333@0.366667@"1 of 20 at 0" +@0.023219954@0.1@0.133333@0.166667@0.2@0.233333@0.266667@0.3@0.333333@0.366667@0.4@"2 of 20 at 0.023" +@0.046439909@0.133333@0.166667@0.2@0.233333@0.266667@0.3@0.333333@0.366667@0.4@0.433333@"3 of 20 at 0.046" +@0.069659863@0.166667@0.2@0.233333@0.266667@0.3@0.333333@0.366667@0.4@0.433333@0.466667@"4 of 20 at 0.069" +@0.092879818@0.2@0.233333@0.266667@0.3@0.333333@0.366667@0.4@0.433333@0.466667@0.5@"5 of 20 at 0.092" +@0.116099773@0.233333@0.266667@0.3@0.333333@0.366667@0.4@0.433333@0.466667@0.5@0.533333@"6 of 20 at 0.116" +@0.139319727@0.266667@0.3@0.333333@0.366667@0.4@0.433333@0.466667@0.5@0.533333@0.566667@"7 of 20 at 0.139" +@0.162539682@0.3@0.333333@0.366667@0.4@0.433333@0.466667@0.5@0.533333@0.566667@0.6@"8 of 20 at 0.162" +@0.185759637@0.333333@0.366667@0.4@0.433333@0.466667@0.5@0.533333@0.566667@0.6@0.633333@"9 of 20 at 0.185" +@0.208979591@0.366667@0.4@0.433333@0.466667@0.5@0.533333@0.566667@0.6@0.633333@0.666667@"10 of 20 at 0.208" +@0.232199546@0.4@0.433333@0.466667@0.5@0.533333@0.566667@0.6@0.633333@0.666667@0.7@"11 of 20 at 0.232" +@0.255419501@0.433333@0.466667@0.5@0.533333@0.566667@0.6@0.633333@0.666667@0.7@0.733333@"12 of 20 at 0.255" +@0.278639455@0.466667@0.5@0.533333@0.566667@0.6@0.633333@0.666667@0.7@0.733333@0.766667@"13 of 20 at 0.278" +@0.301859410@0.5@0.533333@0.566667@0.6@0.633333@0.666667@0.7@0.733333@0.766667@0.8@"14 of 20 at 0.301" +@0.325079365@0.533333@0.566667@0.6@0.633333@0.666667@0.7@0.733333@0.766667@0.8@0.833333@"15 of 20 at 0.325" +@0.348299319@0.566667@0.6@0.633333@0.666667@0.7@0.733333@0.766667@0.8@0.833333@0.866667@"16 of 20 at 0.348" +@0.371519274@0.6@0.633333@0.666667@0.7@0.733333@0.766667@0.8@0.833333@0.866667@0.9@"17 of 20 at 0.371" +@0.394739229@0.633333@0.666667@0.7@0.733333@0.766667@0.8@0.833333@0.866667@0.9@0.933333@"18 of 20 at 0.394" +@0.417959183@0.666667@0.7@0.733333@0.766667@0.8@0.833333@0.866667@0.9@0.933333@0.966667@"19 of 20 at 0.417" +@0.441179138@0.7@0.733333@0.766667@0.8@0.833333@0.866667@0.9@0.933333@0.966667@1@"20 of 20 at 0.441"
--- a/tests/test-csv-writer/test-csv-writer.sh Tue Nov 03 13:42:11 2015 +0000 +++ b/tests/test-csv-writer/test-csv-writer.sh Tue Nov 03 14:31:59 2015 +0000 @@ -7,7 +7,7 @@ trap "rm -f $tmpcsv" 0 -for output in notes-regions curve-vsr; do +for output in notes-regions curve-vsr grid-oss; do flag="" @@ -59,5 +59,18 @@ done +for output in grid-oss; do + for digits in 0 6 2; do + + $r -d "$testplug:$output" -w csv --csv-stdout --csv-digits "$digits" "$infile" 2>/dev/null > "$tmpcsv" || \ + fail "Failed to run for plugin $testplug with output $output and digits $digits" + + # no fuzz here + cmp -s "$tmpcsv" "$mypath/expected/$output-$digits.csv" || \ + faildiff "Output differs from expected for CSV writer with output $output and digits $digits" "$tmpcsv" "$mypath/expected/$output-$digits.csv" + + done +done + exit 0
--- a/tests/test-lab-writer/test-lab-writer.sh Tue Nov 03 13:42:11 2015 +0000 +++ b/tests/test-lab-writer/test-lab-writer.sh Tue Nov 03 14:31:59 2015 +0000 @@ -55,7 +55,8 @@ $r -d "$testplug:$output" -w lab --lab-stdout --lab-digits "$digits" "$infile" 2>/dev/null > "$tmplab" || \ fail "Failed to run for plugin $testplug with output $output and digits $digits" - csvcompare "$tmplab" "$mypath/expected/$output-$digits.lab" || \ + # no fuzz here + cmp -s "$tmplab" "$mypath/expected/$output-$digits.lab" || \ faildiff "Output differs from expected for CSV writer with output $output and digits $digits" "$tmplab" "$mypath/expected/$output-$digits.lab" done