Cleanup yml and test filters

.gitlab-ci.yml

@@ -8,7 +8,7 @@ include:
 .deploy: # do later
   extends: .deploy-to-lac-template
 
-test-matlab850-basic:
+test-matlab850:
   extends: .test-template
   before_script:
   - cd matlab
@@ -16,7 +16,7 @@ test-matlab850-basic:
     MATLABCMD: matlab850
     TESTCASE: basic
 
-test-matlab920-basic:
+test-matlab920:
   extends: .test-template
   before_script:
   - cd matlab
@@ -24,24 +24,6 @@ test-matlab920-basic:
     MATLABCMD: matlab920
     TESTCASE: basic
 
-test-matlab920-all:
-  extends: test-matlab850-basic
-  variables:
-    TESTCASE: all
-  only: 
-  - schedules
-  - web
-  - master
-
-test-matlab850-all:
-  extends: test-matlab920-basic
-  variables:
-    TESTCASE: all
-  only: 
-  - schedules
-  - web
-  - master
-
 .test-matlab850-deployed:
   extends: .test-template-deployed
   variables:

matlab/run_gdat_tests.m

@@ -13,8 +13,8 @@ addpath(genpath(fullfile(fileparts(mfilename('fullpath')),'tests')));
 addpath(genpath(fullfile(fileparts(mfilename('fullpath')),'TCV_IMAS')));
 
 suite_all = [matlab.unittest.TestSuite.fromClass(?test_requestnames_TCV),...
-  matlab.unittest.TestSuite.fromClass(?test_requestnames_AUG)]; %,...
-  %matlab.unittest.TestSuite.fromClass(?test_tcv_get_ids)];
+  matlab.unittest.TestSuite.fromClass(?test_requestnames_AUG),...
+  matlab.unittest.TestSuite.fromClass(?test_tcv_get_ids)];
 
 switch test_case
   case 'all'
@@ -27,14 +27,11 @@ switch test_case
     import matlab.unittest.constraints.ContainsSubstring;
     
     s1 = HasName(ContainsSubstring('TCV')) & ...
-      (HasParameter('Value','ip') | HasParameter('Value','q_rho'));
+      (HasParameter('Value','ip') | HasParameter('Value','q_rho'));    
+    suite = suite_all.selectIf(s1);
+  case 'IMAS'
     s2 = HasTag('IMAS');
-    
-    suite = suite_all.selectIf(s1 | s2);
-  case 'TCV'
-    suite = suite_all.selectIf(HasParameter('machine',IsEqualTo('TCV')));
-  case 'AUG'
-    suite = suite_all.selectIf(HasParameter('machine',IsEqualTo('AUG')));
+    suite = suite_all.selectIf(s2);
   otherwise
     error('not yet implemented')
 end