Ticket #7650: trac_7650-scripts_doctest_force_lib_v2.patch

sage-doctest

@@ -57 +57 @@
 ######################################################    
 DOT_SAGE = os.environ['DOT_SAGE']
 if 'SAGE_TESTDIR' not in os.environ or os.environ['SAGE_TESTDIR'] is "":
-    SAGE_TESTDIR = DOT_SAGE + "/tmp"
+    SAGE_TESTDIR = os.path.join(DOT_SAGE, "tmp")
 else:
     SAGE_TESTDIR = os.environ['SAGE_TESTDIR']
 
@@ -75 +75 @@
 ######################################################    
 SAGE_ROOT = os.environ["SAGE_ROOT"]
 LD = os.environ["LD_LIBRARY_PATH"]
-os.environ["LD_LIBRARY_PATH"] = SAGE_ROOT + "/local/lib:" + LD
-os.environ["PYTHONPATH"]=SAGE_ROOT + "/local/lib/python/site-packages"
+os.environ["LD_LIBRARY_PATH"] = os.path.join(SAGE_ROOT, "local/lib") + ":" + LD
+os.environ["PYTHONPATH"] = os.path.join(SAGE_ROOT,
+                                        "local/lib/python/site-packages")
 if os.environ.has_key('SAGE_PATH'):
-    os.environ["PYTHONPATH"]= os.environ["PYTHONPATH"]+ ':'+os.environ['SAGE_PATH']
+    os.environ["PYTHONPATH"] = os.environ["PYTHONPATH"] + ':' + os.environ['SAGE_PATH']
 
 
 ######################################################
 # Custom flags for the valgrind modes
 ######################################################
 try:
-    SAGE_MEMCHECK_FLAGS=os.environ['SAGE_MEMCHECK_FLAGS']
+    SAGE_MEMCHECK_FLAGS = os.environ['SAGE_MEMCHECK_FLAGS']
     print SAGE_MEMCHECK_FLAGS
 except:
-    SAGE_MEMCHECK_FLAGS=" --leak-resolution=high --log-file=$HOME/.sage/valgrind/sage-memcheck.%p --leak-check=full --num-callers=25 --suppressions=$SAGE_LOCAL/lib/valgrind/sage.supp "
+    SAGE_MEMCHECK_FLAGS = " --leak-resolution=high --log-file=$HOME/.sage/valgrind/sage-memcheck.%p --leak-check=full --num-callers=25 --suppressions=$SAGE_LOCAL/lib/valgrind/sage.supp "
 
 try:
-    SAGE_MASSIF_FLAGS=os.environ['SAGE_MASSIF_FLAGS']
+    SAGE_MASSIF_FLAGS = os.environ['SAGE_MASSIF_FLAGS']
 except:
-    SAGE_MASSIF_FLAGS=" --depth=6 --log-file=$HOME/.sage/valgrind/sage-massif.%p "
+    SAGE_MASSIF_FLAGS = " --depth=6 --log-file=$HOME/.sage/valgrind/sage-massif.%p "
 
 try:
-    SAGE_CALLGRIND_FLAGS=os.environ['SAGE_CALLGRIND_FLAGS']
+    SAGE_CALLGRIND_FLAGS = os.environ['SAGE_CALLGRIND_FLAGS']
 except:
     SAGE_CALLGRIND_FLAGS = " --log-file=$HOME/.sage/valgrind/sage-callgrind.%p "
 
 try:
-    SAGE_CACHEGRIND_FLAGS=os.environ['SAGE_CACHEGRIND_FLAGS']
+    SAGE_CACHEGRIND_FLAGS = os.environ['SAGE_CACHEGRIND_FLAGS']
 except:
-    SAGE_CACHEGRIND_FLAGS=" --log-file=$HOME/.sage/valgrind/sage-cachegrind.%p "
+    SAGE_CACHEGRIND_FLAGS = " --log-file=$HOME/.sage/valgrind/sage-cachegrind.%p "
 
 try:
-    SAGE_OMEGA_FLAGS=os.environ['SAGE_OMEGA_FLAGS']
+    SAGE_OMEGA_FLAGS = os.environ['SAGE_OMEGA_FLAGS']
 except:
    SAGE_OMEGA_FLAGS = " --log-file=$HOME/.sage/valgrind/sage-omega.%p "
 
@@ -148 +149 @@
         return n
 
 def test_code(filename):
-    dict = { 'DIR'             : repr('%s/local/bin' % SAGE_ROOT),
+    dict = { 'DIR'             : repr(os.path.join(SAGE_ROOT, 'local/bin')),
              'FILENAME'        : repr(filename),
              'OUTPUT_FILENAME' : repr(filename + '.timeit.sobj'),
              'TIMEIT'          : do_timeit, # global
@@ -404 +405 @@
     if not library_code:
         if ext in ['.py', '.pyx','.spyx']:
             os.system('cp -f %s %s' % (file_name, SAGE_TESTDIR))
-            tmpfiles.append('%s/%s%s' % (SAGE_TESTDIR, name, ext))
+            tmpfiles.append(os.path.join(SAGE_TESTDIR, '%s%s' % (name, ext)))
             if ext == '.py':
                 s += "from %s import *\n\n" % name
             else:
@@ -412 +413 @@
         elif ext == '.sage':
             os.system('sage -preparse %s' % file_name)
             os.system('mv -f %s.py %s' % (base, SAGE_TESTDIR))
-            tmpfiles.append('%s/%s.py' % (SAGE_TESTDIR, name))
+            tmpfiles.append(os.path.join(SAGE_TESTDIR, name + '.py'))
             s += "from %s import *\n\n" % (name)
         if ext in ['.py', '.sage']:
-            tmpfiles.append('%s/%s.pyc' % (SAGE_TESTDIR, name))
+            tmpfiles.append(os.path.join(SAGE_TESTDIR, name + '.pyc'))
 
     n = 0
     while True:
@@ -589 +590 @@
         if len(s) == 0:
             sys.exit(0)
 
-        f = "%s/.doctest_%s.py"%(SAGE_TESTDIR,name)
+        f = os.path.join(SAGE_TESTDIR, ".doctest_%s.py" % name)
 
         open(f,"w").write(s)
         tmpfiles.append(f)
@@ -610 +611 @@
         if omega:
             cmd = "valgrind --tool=exp-omega " + SAGE_OMEGA_FLAGS + cmd
 
-        VALGRIND = '%s/valgrind/'%DOT_SAGE
+        VALGRIND = os.path.join(DOT_SAGE, 'valgrind')
         if not os.path.exists(VALGRIND):
           os.makedirs(VALGRIND)
 
@@ -742 +743 @@
         massif     = has_opt('massif')
         cachegrind = has_opt('cachegrind')
         omega      = has_opt('omega')
+        force_lib  = has_opt('force_lib')
         random_order = parse_rand()
         only_optional, only_optional_tags = parse_only_opt()
         if long_time:
@@ -751 +753 @@
         if argv[1][0] == '-':
             usage()
             
+        ext = os.path.splitext(argv[1])[1]
+
         library_code = True
-        ext = os.path.splitext(argv[1])[1]
-        if ext in ['.spyx', '.sage'] or \
-                not (os.path.realpath(os.path.join(SAGE_ROOT, 'devel')) in os.path.realpath(argv[1])):
+        dev_path = os.path.realpath(os.path.join(SAGE_ROOT, 'devel'))
+        our_path = os.path.realpath(argv[1])
+
+        if not force_lib and (ext in ['.spyx', '.sage'] or
+                              not dev_path in our_path):
             library_code = False
 
         try:

sage-test

@@ -43 +43 @@
 
 SAGE_ROOT=os.environ['SAGE_ROOT']
 if 'SAGE_TESTDIR' not in os.environ:
-    os.environ['SAGE_TESTDIR'] = SAGE_ROOT + "/tmp"
-TMP=os.environ['SAGE_TESTDIR'] + "/tmp"
+    os.environ['SAGE_TESTDIR'] = os.path.join(SAGE_ROOT, "tmp")
+TMP = os.path.join(os.environ['SAGE_TESTDIR'], "tmp")
 if not os.path.exists(TMP):
     os.makedirs(TMP)
 
@@ -56 +56 @@
 
 def skip(F):
     G = abspath(F)
-    i = G.rfind('/')
-    if os.path.exists('%s/nodoctest.py'%G[:i]):
+    i = G.rfind(os.sep)
+    if os.path.exists(os.path.join(G[:i], 'nodoctest.py')):
         print "%s (skipping) -- nodoctest.py file in directory"%sage_test_command(F)
         return True
 
     if 'nodoctest' in open(G).read()[:50]:
         return True
-    if G.find('doc/output') != -1:
+    if G.find(os.path.join('doc', 'output')) != -1:
         return True
 
     sys.stdout.write("%-60s"%sage_test_command(F)+"\n")
@@ -77 +77 @@
     if skip(F):
         return 0
     try:
-        s = '%s/local/bin/sage-%s "%s"'%(SAGE_ROOT, cmd, F)
+        s = os.path.join(SAGE_ROOT, 'local/bin/sage-%s' % cmd) + ' "%s"' % F
         err = os.system(s)   # need to catch control c by writing to a file and looking at it??
     except KeyboardInterrupt:
         print "Keyboard Interrupt"
@@ -92 +92 @@
 
 def test_file(F):
     if not os.path.exists(F):
-        if os.path.exists(os.environ["SAGE_ROOT"] + "/" + F):
-            F = os.environ["SAGE_ROOT"] + "/" + F
+        if os.path.exists(os.path.join(os.environ["SAGE_ROOT"], F)):
+            F = os.path.join(os.environ["SAGE_ROOT"], F)
     if not os.path.exists(F):
         if F[:6] != "__test" and not F.endswith('.png'):
-            print "ERROR: File %s/%s is missing"%(os.curdir,F)
-            failed.append('%s/%s'%(os.curdir,F))
+            print "ERROR: File %s is missing" % os.path.join(os.curdir, F)
+            failed.append(os.path.join(os.curdir, F))
         return 1
 
     base, ext = os.path.splitext(F)
     if ext in ['.py', '.spyx', '.pyx', '.tex', '.pxi', '.sage', '.rst']:
-        return test(F, 'doctest '+opts)
+        return test(F, 'doctest ' + opts)
     elif os.path.isdir(F) and not (F[:1] == '.') \
-            and not '#' in F and not '/notes' in F:
+            and not '#' in F and not os.sep + 'notes' in F:
         ld = os.listdir(F)
         if not ('__nodoctest__' in ld):
             for L in ld:
-                k = test_file('%s/%s'%(F,L))
+                k = test_file(os.path.join(F, L))
     return 0
 
 files = argv[1:]