diff options
| author | fche <fche> | 2005-07-15 14:49:59 +0000 |
|---|---|---|
| committer | fche <fche> | 2005-07-15 14:49:59 +0000 |
| commit | eaf134e777a0c1e31e3351a5bba0784f2eefda8e (patch) | |
| tree | d36e833cd7225d238e6c63a86de1076ce465a704 | |
| parent | 92ade41d92c63f6909dcd5982bdc9db6ee10ff5d (diff) | |
| download | systemtap-steved-eaf134e777a0c1e31e3351a5bba0784f2eefda8e.tar.gz systemtap-steved-eaf134e777a0c1e31e3351a5bba0784f2eefda8e.tar.xz systemtap-steved-eaf134e777a0c1e31e3351a5bba0784f2eefda8e.zip | |
2005-07-15 Frank Ch. Eigler <fche@redhat.com>
* Makefile.am (install-data-local): Correct typo.
* buildrun.cxx (compile_pass): Ditto.
* main.cxx (main): Print errors if passes 4 or 5 fail.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | buildrun.cxx | 1 | ||||
| -rw-r--r-- | main.cxx | 11 |
5 files changed, 20 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2005-07-15 Frank Ch. Eigler <fche@redhat.com> + + * Makefile.am (install-data-local): Correct typo. + * buildrun.cxx (compile_pass): Ditto. + * main.cxx (main): Print errors if passes 4 or 5 fail. + 2005-07-14 Frank Ch. Eigler <fche@redhat.com> * buildrun.cxx (compile_pass, run_pass): Get closer to a working diff --git a/Makefile.am b/Makefile.am index b2ba7b1f..efd1b0f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ dist-hook: install-data-local: mkdir -p $(DESTDIR)$(pkgdatadir) cp -rp $(srcdir)/runtime $(DESTDIR)$(pkgdatadir) - find $(DESTDIR)$(pkgdatadir)/testsuite -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf + find $(DESTDIR)$(pkgdatadir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf p=$(srcdir)/testsuite/parse s=$(srcdir)/testsuite/sem diff --git a/Makefile.in b/Makefile.in index f7023074..5bdd8cfe 100644 --- a/Makefile.in +++ b/Makefile.in @@ -745,7 +745,7 @@ dist-hook: install-data-local: mkdir -p $(DESTDIR)$(pkgdatadir) cp -rp $(srcdir)/runtime $(DESTDIR)$(pkgdatadir) - find $(DESTDIR)$(pkgdatadir)/testsuite -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf + find $(DESTDIR)$(pkgdatadir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf gcov: @$(MAKE) clean CXXFLAGS="-g -fprofile-arcs -ftest-coverage" all check diff --git a/buildrun.cxx b/buildrun.cxx index 77ce283c..959db90f 100644 --- a/buildrun.cxx +++ b/buildrun.cxx @@ -47,6 +47,7 @@ compile_pass (systemtap_session& s) { // Assumes linux 2.6 kbuild o << "CFLAGS += -Werror" << endl; + o << "CFLAGS += -I \"" << s.runtime_path << "\"" << endl; o << "CFLAGS += -I \"" << s.runtime_path << "/relayfs\"" << endl; o << "obj-m := " << s.module_name << ".o" << endl; o.close (); @@ -263,6 +263,7 @@ main (int argc, char * const argv []) } } + // syntax errors, if any, are already printed if (s.verbose) clog << "Pass 1: parsed user script and " << s.library_files.size() << " library script(s)." << endl; @@ -325,6 +326,7 @@ main (int argc, char * const argv []) << s.functions.size() << " function(s), " << s.globals.size() << " global(s)." << endl; + // semantic errors, if any, are already printed if (rc || s.last_pass == 2) goto cleanup; // PASS 3: TRANSLATION @@ -341,16 +343,25 @@ main (int argc, char * const argv []) << s.translated_source << "\"" << endl; + // translation errors, if any, are already printed if (rc || s.last_pass == 3) goto cleanup; // PASS 4: COMPILATION rc = compile_pass (s); + if (rc) + cerr << "Pass 4: compilation failed. " + << "Try again with '-v' (verbose) option." << endl; + if (rc || s.last_pass == 4) goto cleanup; // PASS 5: RUN rc = run_pass (s); + if (rc) + cerr << "Pass 5: run failed. " + << "Try again with '-v' (verbose) option." << endl; + // if (rc) goto cleanup; cleanup: |