Changeset 20500 for issm/trunk/test/NightlyRun/IdFromString.m

Timestamp:

04/12/16 21:32:01 (9 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 20497

Location:

issm/trunk

Files:

• . (modified) (2 props)
• test (modified) (1 prop)
• test/NightlyRun/IdFromString.m (modified) (3 diffs)

issm/trunk

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

issm/trunk/test/NightlyRun/IdFromString.m

@@ -8 +8 @@
 %      ids=IdFromString('Parallel');
 %      ids=IdFromString('79North');
+%      ids=IdFromString('*');          %Print all tests
 
 %Check input
@@ -18 +19 @@
 
 %Grep string
-[dummy ids_raw]=system(['find ./ -name "test[0-9]*.m" | xargs grep "%Test Name:" | grep ' string ' | sed -e "s/test/ /g" -e "s/\.m:/ /g" | awk {''print $2''}']);
+if strcmp(string,'*'),
+        [dummy ids_raw]=system(['find ./ -name "test[0-9]*.m" | xargs grep "%Test Name:" | sed -e "s/test/ /g" -e "s/\.m:/ /g" | awk {''print $2''}']);
+else
+        [dummy ids_raw]=system(['find ./ -name "test[0-9]*.m" | xargs grep "%Test Name:" | grep ' string ' | sed -e "s/test/ /g" -e "s/\.m:/ /g" | awk {''print $2''}']);
+end
 
 %return if no test found
@@ -27 +32 @@
 
 %Process string (delete return carriage);
-ids_raw=strsplit(ids_raw,char(10));
+ids_raw=strsplit_strict(ids_raw,char(10));
 ids_raw=ids_raw(1:end-1);
 for i=1:length(ids_raw),
         eval(['ids=[ids ' ids_raw{i} '];']); 
 end
+ids=sort(ids);
 
 %Display names

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad