Changeset 94b1022a for src/tests

Timestamp:

May 30, 2018, 9:28:18 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

bd946e4

Parents:

35718a9 (diff), ae32d96 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src/tests

Files:

• concurrent/signal/barge.c (deleted)
• concurrent/signal/block.c (modified) (1 diff)
• concurrent/signal/disjoint.c (modified) (2 diffs)
• pybin/tools.py (modified) (2 diffs)
• test.py (modified) (1 diff)

src/tests/concurrent/signal/block.c

@@ -40 +40 @@
 }
 
-void ^?{} ( global_data_t & this ) {}
+void ^?{} ( global_data_t & mutex this ) {}
 
 global_data_t globalA, globalB;

src/tests/concurrent/signal/disjoint.c

@@ -26 +26 @@
 monitor global_data_t;
 void ?{}( global_data_t & this );
-void ^?{} ( global_data_t & this );
+void ^?{} ( global_data_t & mutex this );
 
 monitor global_data_t {
@@ -42 +42 @@
 }
 
-void ^?{} ( global_data_t & this ) {}
+void ^?{} ( global_data_t & mutex this ) {}
 
 //------------------------------------------------------------------------------

src/tests/pybin/tools.py

@@ -83 +83 @@
         return sh(cmd)
 
+def which(program):
+    import os
+    def is_exe(fpath):
+        return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
+
+    fpath, fname = os.path.split(program)
+    if fpath:
+        if is_exe(program):
+            return program
+    else:
+        for path in os.environ["PATH"].split(os.pathsep):
+            exe_file = os.path.join(path, program)
+            if is_exe(exe_file):
+                return exe_file
+
+    return None
 ################################################################################
 #               file handling
@@ -219 +235 @@
         return False
 
+def fancy_print(text):
+        column = which('column')
+        if column:
+                cmd = "%s 2> /dev/null" % column
+                print(cmd)
+                proc = Popen(cmd, stdin=PIPE, stderr=None, shell=True)
+                proc.communicate(input=text)
+        else:
+                print(text)
 
 settings.set_machine_default( getMachineType )

src/tests/test.py

@@ -277 +277 @@
         elif options.list :
                 print("Listing for %s:%s"% (settings.arch.string, settings.debug.string))
-                print("\n".join(map(lambda t: "%s" % (t.toString()), tests)))
+                fancy_print("\n".join(map(lambda t: "%s" % (t.toString()), tests)))
 
         else :