organise output files

Author: archmoj

.circleci/config.yml

@@ -56,6 +56,11 @@ jobs:
       - run:
           name: Display system information
           command: npm run system-info > ~/Downloads/system_info.txt
+      - run:
+          name: Combine CSV files
+          command: |
+            head -n 1 `ls ~/Downloads/*.csv | head -n 1` > ~/Downloads/all.csv
+            tail -n+2 -q ~/Downloads/*.csv >> ~/Downloads/all.csv
       - store_artifacts:
           path: ~/Downloads
           destination: /

test/jasmine/performance_tests/all_test.js

@@ -198,8 +198,10 @@ function makeScatterGeo(spec) {
 describe('Performance test various traces', function() {
     'use strict';
 
+    var filename;
+
     afterAll(function(done) {
-        downloadCSV(tests);
+        downloadCSV(tests, filename);
         // delay for the download to be completed
         delay(1000)().then(done)
     });
@@ -209,11 +211,28 @@ describe('Performance test various traces', function() {
 
         var testCase = __karma__.config.testCase;
 
+        filename = '';
+
         if(testCase) {
-            if(testCase.tracesType && testCase.tracesType !== spec.traceType) testIt = false;
-            if(testCase.tracesCount && testCase.tracesCount !== spec.nTraces) testIt = false;
-            if(testCase.tracesPoints && testCase.tracesPoints !== spec.n) testIt = false;
-            if((testCase.tracesMode !== 'undefined' && testCase.tracesMode) && testCase.tracesMode !== spec.mode) testIt = false;
+            if(testCase.tracesType) {
+                filename += testCase.tracesType;
+                if(testCase.tracesType !== spec.traceType) testIt = false;
+            }
+
+            if(testCase.tracesMode && testCase.tracesMode !== 'undefined') {
+                filename += '_' + testCase.tracesMode;
+                if(testCase.tracesMode !== spec.mode) testIt = false;
+            }
+
+            if(testCase.tracesPoints) {
+                filename += '_' + testCase.tracesPoints;
+                if(testCase.tracesPoints !== spec.n) testIt = false;
+            }
+
+            if(testCase.tracesCount) {
+                filename += '_' + testCase.tracesCount;
+                if(testCase.tracesCount !== spec.nTraces) testIt = false;
+            }
         }
 
         if(testIt) {

test/jasmine/performance_tests/assets/post_process.js

@@ -1,4 +1,4 @@
-exports.downloadCSV = function(allTests) {
+exports.downloadCSV = function(allTests, filename) {
     var str = [
         'number of traces',
         'chart type',
@@ -28,7 +28,7 @@ exports.downloadCSV = function(allTests) {
     var myBlob = new Blob([str], {type: 'text/plain'})
     var url = window.URL.createObjectURL(myBlob);
     a.href = url;
-    a.download = 'results.csv';
+    a.download = (filename || 'results') + '.csv';
     a.style.display = 'none';
     document.body.append(a);
     a.click();