Changeset 23796

Timestamp:

03/13/19 14:52:30 (6 years ago)

Author:

jdquinn

Message:

BUG: Indentation errors; typos; missing env var PYTHONSTARTUP

Location:

issm/trunk-jpl

Files:

• jenkins/jenkins.sh (modified) (1 diff)
• test/NightlyRun/runme.py (modified) (1 diff)

issm/trunk-jpl/jenkins/jenkins.sh

@@ -354 +354 @@
 #Launch all tests on different cpus
 export PYTHONPATH="$ISSM_DIR/src/m/dev"
+export PYTHONSTARTUP="${PYTHONPATH}/devpath.py"
 export PYTHONUNBUFFERED=1 #we don't want python to buffer otherwise issm.exe output is not captured
 for (( i=1;i<=$NUMCPUS_RUN;i++ ))

issm/trunk-jpl/test/NightlyRun/runme.py

@@ -229 +229 @@
 
 if __name__ == '__main__':
-    if 'PYTHONSTARTUP' in os.environ:
-        PYTHONSTARTUP = os.environ['PYTHONSTARTUP']
-        #print 'PYTHONSTARTUP =', PYTHONSTARTUP
-        if os.path.exists(PYTHONSTARTUP):
-            try:
-                exec(compile(open(PYTHONSTARTUP).read(), PYTHONSTARTUP, 'exec'))
-            except Exception as e:
-                print("PYTHONSTARTUP error: ", e)
-        else:
-            print(("PYTHONSTARTUP file '{}' does not exist.".format(PYTHONSTARTUP)))
-
-        parser = argparse.ArgumentParser(description='RUNME - test deck for ISSM nightly runs')
-        parser.add_argument('-i', '--id', nargs='*', type=int, help='followed by the list of ids requested', default=[])
-        parser.add_argument('-in', '--include_name', nargs='*', type=str, help='followed by the list of test names requested', default=[])
-        parser.add_argument('-e', '--exclude', nargs=' + ', type=int, help='ids to be excluded from the test', default=[])
-        parser.add_argument('-en', '--exclude_name', nargs=' + ', type=str, help='test names to be excluded from the test', default=[])
-        parser.add_argument('-b', '--benchmark', help='nightly/ismip/eismint/thermal/mesh/...', default='nightly')
-        parser.add_argument('-p', '--procedure', help='check/update', default='check')
-        parser.add_argument('-o', '--output', help='nightly/daily/none', default='none')
-        parser.add_argument('-r', '--rank', type=int, help='rank', default=1)
-        parser.add_argument('-n', '--numprocs', type=int, help='numprocs', default=1)
-        args = parser.parse_args()
-
-        md = runme([args.id, args.include_name], [args.exclude, args.exclude_name], args.benchmark, args.procedure, args.output, args.rank, args.numprocs)
-
-        if args.output == 'nightly':
-            print("PYTHONEXITEDCORRECTLY")
-
-        exit(md)
+        if 'PYTHONSTARTUP' in os.environ:
+                PYTHONSTARTUP = os.environ['PYTHONSTARTUP']
+                #print 'PYTHONSTARTUP =', PYTHONSTARTUP
+                if os.path.exists(PYTHONSTARTUP):
+                        try:
+                                exec(compile(open(PYTHONSTARTUP).read(), PYTHONSTARTUP, 'exec'))
+                        except Exception as e:
+                                print("PYTHONSTARTUP error: ", e)
+                else:
+                        print(("PYTHONSTARTUP file '{}' does not exist.".format(PYTHONSTARTUP)))
+
+                parser = argparse.ArgumentParser(description='RUNME - test deck for ISSM nightly runs')
+                parser.add_argument('-i', '--id', nargs='*', type=int, help='followed by the list of ids requested', default=[])
+                parser.add_argument('-in', '--include_name', nargs='*', type=str, help='followed by the list of test names requested', default=[])
+                parser.add_argument('-e', '--exclude', nargs='+', type=int, help='ids to be excluded from the test', default=[])
+                parser.add_argument('-en', '--exclude_name', nargs='+', type=str, help='test names to be excluded from the test', default=[])
+                parser.add_argument('-b', '--benchmark', help='nightly/ismip/eismint/thermal/mesh/...', default='nightly')
+                parser.add_argument('-p', '--procedure', help='check/update', default='check')
+                parser.add_argument('-o', '--output', help='nightly/daily/none', default='none')
+                parser.add_argument('-r', '--rank', type=int, help='rank', default=1)
+                parser.add_argument('-n', '--numprocs', type=int, help='numprocs', default=1)
+                args = parser.parse_args()
+
+                md = runme([args.id, args.include_name], [args.exclude, args.exclude_name], args.benchmark, args.procedure, args.output, args.rank, args.numprocs)
+
+                if args.output == 'nightly':
+                        print("PYTHONEXITEDCORRECTLY")
+
+                exit(md)