/[escript]/trunk/site_scons/grouptest.py
ViewVC logotype

Diff of /trunk/site_scons/grouptest.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3944 by jfenwick, Thu Jun 14 01:01:03 2012 UTC revision 3945 by jfenwick, Tue Aug 21 04:11:13 2012 UTC
# Line 42  class GroupTest: Line 42  class GroupTest:
42      res=res+"function failed()\n{\n  echo ""Execution failed for $@""\n  exit 1\n}\n"      res=res+"function failed()\n{\n  echo ""Execution failed for $@""\n  exit 1\n}\n"
43      res=res+"if [ $# -ne 2 ]\nthen\n echo Usage: $0 build_dir wrapper_options\necho Runs all unit tests. Options must be a single string.\nexit 2\nfi\n"      res=res+"if [ $# -ne 2 ]\nthen\n echo Usage: $0 build_dir wrapper_options\necho Runs all unit tests. Options must be a single string.\nexit 2\nfi\n"
44      res=res+'CMDSTR="getopt -uq -o p:n: -- $2"\nSTR=`$CMDSTR`\nNUMPROCS=1\n'      res=res+'CMDSTR="getopt -uq -o p:n: -- $2"\nSTR=`$CMDSTR`\nNUMPROCS=1\n'
45        res=res+'MPITYPE=`run-escript -c | grep mpi=`\n'
46      res=res+'NUMNODES=1\n#This little complication is required because set --\n'      res=res+'NUMNODES=1\n#This little complication is required because set --\n'
47      res=res+'#does not seem to like -n as the first positional parameter\n'      res=res+'#does not seem to like -n as the first positional parameter\n'
48      res=res+'STATE=0\nfor name in $STR\ndo \n'      res=res+'STATE=0\nfor name in $STR\ndo \n'
# Line 69  class GroupTest: Line 70  class GroupTest:
70      def makeString(self):      def makeString(self):
71      res=""      res=""
72          if self.single_processor_only:          if self.single_processor_only:
73              res+="if [ $MPIPROD -le 1 ]; then\n"              res+="#if [ $MPIPROD -le 1 ]; then\n"
74            res+='if [$MPITYPE" == "mpi=none" ]; then\n'
75              tt="\t"              tt="\t"
76          else:          else:
77              tt=""              tt=""

Legend:
Removed from v.3944  
changed lines
  Added in v.3945

  ViewVC Help
Powered by ViewVC 1.1.26