Merge pull request #111 from davidmalcolm/add-rich-locations

Add rich locations

Author: davidmalcolm

Makefile

@@ -1,5 +1,5 @@
-#   Copyright 2011, 2012, 2013 David Malcolm <dmalcolm@redhat.com>
-#   Copyright 2011, 2012, 2013 Red Hat, Inc.
+#   Copyright 2011-2013, 2017 David Malcolm <dmalcolm@redhat.com>
+#   Copyright 2011-2013, 2017 Red Hat, Inc.
 #
 #   This is free software: you can redistribute it and/or modify it
 #   under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 #   <http://www.gnu.org/licenses/>.
 
 .PHONY: all clean debug dump_gimple plugin show-ssa tarball \
-	test-suite testcpychecker testcpybuilder \
+	test-suite testcpychecker testcpybuilder testdejagnu \
 	man
 
 PLUGIN_SOURCE_FILES= \
@@ -121,7 +121,7 @@ ifneq "$(PLUGIN_PYTHONPATH)" ""
   CPPFLAGS+= -DPLUGIN_PYTHONPATH='"$(PLUGIN_PYTHONPATH)"'
 endif
 
-all: autogenerated-config.h testcpybuilder test-suite testcpychecker
+all: autogenerated-config.h testcpybuilder testdejagnu test-suite testcpychecker
 
 # What still needs to be wrapped?
 api-report:
@@ -276,6 +276,10 @@ testcpychecker: plugin
 testcpybuilder:
 	$(PYTHON) testcpybuilder.py -v
 
+# Selftest for the dejagnu.py code:
+testdejagnu:
+	$(PYTHON) dejagnu.py -v
+
 dump_gimple:
 	$(CC) -fdump-tree-gimple $(CURDIR)/test.c
 
@@ -289,7 +293,7 @@ demo: plugin
 json-examples: plugin
 	$(INVOCATION_ENV_VARS) $(srcdir)./gcc-with-cpychecker -I/usr/include/python2.7 -c libcpychecker_html/test/example1/bug.c
 
-test-suite: plugin print-gcc-version
+test-suite: plugin print-gcc-version testdejagnu
 	$(INVOCATION_ENV_VARS) $(PYTHON) run-test-suite.py
 
 show-ssa: plugin
@@ -394,16 +398,14 @@ rpm:
 	rpmbuild -ba gcc-python-plugin.spec
 
 # Perform a test (scratch) build in Koji:
-# f16 was gcc 4.6, but this has been deleted from Koji
-# f17: gcc 4.7
-# f19: gcc 4.8
-koji-gcc-4.6: srpm
-	koji build --scratch f16 ~/rpmbuild/SRPMS/gcc-python-plugin-$(VERSION)-1.fc17.src.rpm
-
-koji-gcc-4.7: srpm
-	koji build --scratch f17 ~/rpmbuild/SRPMS/gcc-python-plugin-$(VERSION)-1.fc17.src.rpm
+# The following have been deleted from Koji:
+#   f16 was gcc 4.6
+#   f17 was gcc 4.7
+#   f19 was gcc 4.8
+koji-gcc-5: srpm
+	koji build --scratch f23 ~/rpmbuild/SRPMS/gcc-python-plugin-$(VERSION)-1.fc20.src.rpm
 
-koji-gcc-4.8: srpm
-	koji build --scratch f19 ~/rpmbuild/SRPMS/gcc-python-plugin-$(VERSION)-1.fc17.src.rpm
+koji-gcc-6: srpm
+	koji build --scratch f24 ~/rpmbuild/SRPMS/gcc-python-plugin-$(VERSION)-1.fc20.src.rpm
 
-koji: koji-gcc-4.7 koji-gcc-4.8
+koji: koji-gcc-5 koji-gcc-6