Changeset e75b753

Timestamp:

Jun 27, 2021, 10:07:16 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

1781e97, 44b37de

Parents:

2ac218d (diff), 22a4292 (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:

fix conflict

Files:

• INSTALL (modified) (2 diffs)
• tests/pybin/tools.py (modified) (1 diff)

INSTALL

@@ -9 +9 @@
 
   $ ./autogen.sh
-  $ ./configure
+  $ ./configure [ --prefix=/some/directory ]
   $ make -j 8 install
 
-For users using the distributed tarball:
+For users using the distributed tarball / github:
 
   $ ./configure
@@ -20 +20 @@
 
 
-Options for 'configure'
+Options for configure
 ======================================
-The script 'configure' accepts many command line arguments.  Run './configure
---help' to see a list of all of them.  This document attempts to summarize the
-most useful arguments.
+The script 'configure' accepts many command-line arguments.  Run
 
---prefix=/some/directory controls the path prefix common to all installed
-  cfa-cc components.  Some components are installed in /some/directory/bin,
-  others in /some/directory/lib.  If unspecified, this defaults to /usr/local.
-  To use (a subdirectory of) your home directory, ${HOME}/some/dir works, but
-  it is important not to put quotes around the directory path; Cforall may
-  appear to build, but the installed version may not work properly.
+  $ ./configure --help
+
+to list them.  The most common argument is:
+
+  --prefix=/some/directory controls the path prefix common to all installed
+    cfa-cc components.  Components are installed in directories bin and lib.
+    If unspecified, prefix defaults to /usr/local.  To use (a subdirectory of)
+    your home directory, ${HOME}/some/dir, but do not put quotes around the
+    directory path; Cforall may appear to build, but the installed version may
+    not work properly.
 
 

tests/pybin/tools.py

@@ -376 +376 @@
                 return 1, "ERR No core dump"
 
-        return sh('gdb', '-n', path, core, '-batch', '-x', cmd, output_file=subprocess.PIPE)
+        try:
+                return sh('gdb', '-n', path, core, '-batch', '-x', cmd, output_file=subprocess.PIPE)
+        except:
+                return 1, "ERR Could not read core with gdb"
 
 def core_archive(dst, name, exe):