emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] scratch/merge-cedet-tests 23fa6fe 316/316: Remove tests an


From: Edward John Steere
Subject: [Emacs-diffs] scratch/merge-cedet-tests 23fa6fe 316/316: Remove tests and redundant resources not destined for merge
Date: Fri, 27 Jan 2017 20:03:50 +0000 (UTC)

branch: scratch/merge-cedet-tests
commit 23fa6feb1f884638825945d6bcba47cf09ec0ff1
Author: Edward John Steere <address@hidden>
Commit: Edward John Steere <address@hidden>

    Remove tests and redundant resources not destined for merge
    
    Many of the resource files are in another location after the merge and
    the patches did not cover that movement.  Other files are not
    appropriate for Emacs core; such as the ede and README files.  Even
    more still relate to Java, COGRE and other such features not destined
    for merging.  Files with modifications were those were many patches
    failed and I decided to follow up the merge with a diff to their
    counterpart in upstream.
    * test/manual/cedet/Makefile: deleted
    * test/manual/cedet/Project.ede: deleted
    * test/manual/cedet/README: deleted
    * test/manual/cedet/cedet-integ-test.el: (ede-make, cogre, cit-uml,
      cit-android, cit-gnustep, cedet-integ-test-android,
      cedet-integ-test-GNUStep): deleted.  (cedet-integ-base,
      cit-checkenv, cit-projvar, cit-cpproot, cit-globalref): new
      requires.  (cedet-integ-test-Make): merged diffs from
      upstream.  (cedet-integ-test-cpproot): added from
      upstream.  (cedet-integ-test-globalref): added from
      upstream. (cit-finish-message): merged diffs from
      upstream.  (cit-srecode-fill-with-stuff-notest): added from
      upstream.  (cit-srecode-insert-taglist): added from
      upstream.  (cit-tag-verify-error-debug): merged diffs from
      upstream.  (cit-compile-and-wait): merged diffs from
      upstream.  (cit-compile-and-wait-using-ede-command): merged diffs
      from upstream.  (cit-wait-for-compilation): merged diffs from
      upstream.  (cit-check-compilation-for-error): merged diffs from
      upstream.  (cit-run-target): merged diffs from upstream.
    * test/manual/cedet/cedet-utests.el: (cedet-compat,
      cedet/ede/compdb-utest, cedet/cogre/utestcedet/cogre/utest,
      cedet/cogre/periodic-utest, cedet/cogre/convert-utest):
      deleted.  (cit-utest-alist): Merged diffs from
      upstream.  (cedet-utest): merged diffs from upstream.
    * test/manual/cedet/cedet/ede/detect-utest.el:
      (ede-detect-utest-project-entries): removed android, compdb, ninja,
      lein, maven and java-root detection.  (ede-java-root-project):
      deleted.
    * test/manual/cedet/cedet/semantic/utest-parse.el:
      (semantic-utest-C-buffer-contents, semantic-utest-C-name-contents,
      semantic-utest-Python-buffer-contents,
      semantic-utest-Python-name-contents,
      semantic-utest-Scheme-buffer-contents, semantic-utest-Makefile):
      merged diffs from.
    * test/manual/cedet/cit-checkenv.el: (cedet-java):
      deleted.  (cit-checkenv-test): merged diffs from upstream.
    * test/manual/cedet/cit-cpp.el: (cit-remove-add-to-project-cpp,
      cit-remove-and-do-shared-lib): merged diffs from upstream.
    * test/manual/cedet/cit-cpproot.el: (cit-src-cpproot-main-tags,
      cit-cpproot-depfiles, cit-ede-cpproot-test):  merged diffs from
      upstream.
    * test/manual/cedet/cit-javaroot.el: deleted
    * test/manual/cedet/cit-test.sh: deleted
    * test/manual/cedet/ede-tests.el: deleted
    * test/manual/cedet/semantic-ia-utest.el: deleted
    * test/manual/cedet/semantic-tests.el: deleted
    * test/manual/cedet/semantic-utest-c.el: deleted
    * test/manual/cedet/semantic-utest.el: deleted
    * test/manual/cedet/srecode-tests.el: deleted
    * test/manual/cedet/tests/test.c: deleted
    * test/manual/cedet/tests/test.el: deleted
    * test/manual/cedet/tests/test.make: deleted
    * test/manual/cedet/tests/testdoublens.cpp: deleted
    * test/manual/cedet/tests/testdoublens.hpp: deleted
    * test/manual/cedet/tests/testfriends.cpp: deleted
    * test/manual/cedet/tests/testjavacomp.java: deleted
    * test/manual/cedet/tests/testnsp.cpp: deleted
    * test/manual/cedet/tests/testpolymorph.cpp: deleted
    * test/manual/cedet/tests/testspp.c: deleted
    * test/manual/cedet/tests/testsppcomplete.c: deleted
    * test/manual/cedet/tests/testsppreplace.c: deleted
    * test/manual/cedet/tests/testsppreplaced.c: deleted
    * test/manual/cedet/tests/testsubclass.cpp: deleted
    * test/manual/cedet/tests/testsubclass.hh: deleted
    * test/manual/cedet/tests/testtypedefs.cpp: deleted
    * test/manual/cedet/tests/testvarnames.c: deleted
---
 test/ChangeLog.1                                | 2204 +++++++++++++++++++++++
 test/manual/cedet/Makefile                      |   67 -
 test/manual/cedet/Project.ede                   |   28 -
 test/manual/cedet/README                        |   12 -
 test/manual/cedet/cedet-integ-test.el           |  300 +--
 test/manual/cedet/cedet-utests.el               |   43 +-
 test/manual/cedet/cedet/ede/detect-utest.el     |   25 -
 test/manual/cedet/cedet/semantic/utest-parse.el |  138 +-
 test/manual/cedet/cit-checkenv.el               |   13 -
 test/manual/cedet/cit-cpp.el                    |   71 +-
 test/manual/cedet/cit-cpproot.el                |   32 +-
 test/manual/cedet/cit-javaroot.el               |  153 --
 test/manual/cedet/cit-test.sh                   |   28 -
 test/manual/cedet/ede-tests.el                  |   87 -
 test/manual/cedet/semantic-ia-utest.el          |  528 ------
 test/manual/cedet/semantic-tests.el             |  389 ----
 test/manual/cedet/semantic-utest-c.el           |   72 -
 test/manual/cedet/semantic-utest.el             |  867 ---------
 test/manual/cedet/srecode-tests.el              |  296 ---
 test/manual/cedet/tests/test.c                  |  242 ---
 test/manual/cedet/tests/test.el                 |  158 --
 test/manual/cedet/tests/test.make               |   79 -
 test/manual/cedet/tests/testdoublens.cpp        |  166 --
 test/manual/cedet/tests/testdoublens.hpp        |   70 -
 test/manual/cedet/tests/testfriends.cpp         |   38 -
 test/manual/cedet/tests/testjavacomp.java       |   67 -
 test/manual/cedet/tests/testnsp.cpp             |   29 -
 test/manual/cedet/tests/testpolymorph.cpp       |  130 --
 test/manual/cedet/tests/testspp.c               |  102 --
 test/manual/cedet/tests/testsppcomplete.c       |   30 -
 test/manual/cedet/tests/testsppreplace.c        |  154 --
 test/manual/cedet/tests/testsppreplaced.c       |  117 --
 test/manual/cedet/tests/testsubclass.cpp        |  249 ---
 test/manual/cedet/tests/testsubclass.hh         |  191 --
 test/manual/cedet/tests/testtypedefs.cpp        |   81 -
 test/manual/cedet/tests/testvarnames.c          |   90 -
 36 files changed, 2537 insertions(+), 4809 deletions(-)

diff --git a/test/ChangeLog.1 b/test/ChangeLog.1
index 4491eb8..f5a3f3d 100644
--- a/test/ChangeLog.1
+++ b/test/ChangeLog.1
@@ -1,3 +1,2207 @@
+2017-01-25 Edward John Steere <address@hidden>
+
+       Remove tests and redundant resources not destined for merge
+
+       Many of the resource files are in another location after the merge and
+       the patches did not cover that movement.  Other files are not
+       appropriate for Emacs core; such as the ede and README files.  Even
+       more still relate to Java, COGRE and other such features not destined
+       for merging.  Files with modifications were those were many patches
+       failed and I decided to follow up the merge with a diff to their
+       counterpart in upstream.
+       * test/manual/cedet/Makefile: deleted
+       * test/manual/cedet/Project.ede: deleted
+       * test/manual/cedet/README: deleted
+       * test/manual/cedet/cedet-integ-test.el: (ede-make, cogre, cit-uml)
+       (cit-android, cit-gnustep, cedet-integ-test-android)
+       (cedet-integ-test-GNUStep): deleted.  (cedet-integ-base,
+       cit-checkenv, cit-projvar, cit-cpproot, cit-globalref): new
+       requires.  (cedet-integ-test-Make): merged diffs from
+       upstream.  (cedet-integ-test-cpproot): added from
+       upstream.  (cedet-integ-test-globalref): added from
+       upstream. (cit-finish-message): merged diffs from
+       upstream.  (cit-srecode-fill-with-stuff-notest): added from
+       upstream.  (cit-srecode-insert-taglist): added from
+       upstream.  (cit-tag-verify-error-debug): merged diffs from
+       upstream.  (cit-compile-and-wait): merged diffs from
+       upstream.  (cit-compile-and-wait-using-ede-command): merged diffs
+       from upstream.  (cit-wait-for-compilation): merged diffs from
+       upstream.  (cit-check-compilation-for-error): merged diffs from
+       upstream.  (cit-run-target): merged diffs from upstream.
+       * test/manual/cedet/cedet-utests.el: (cedet-compat)
+       (cedet/ede/compdb-utest, cedet/cogre/utestcedet/cogre/utest)
+       (cedet/cogre/periodic-utest, cedet/cogre/convert-utest):
+       deleted.  (cit-utest-alist): Merged diffs from
+       upstream.  (cedet-utest): merged diffs from upstream.
+       * test/manual/cedet/cedet/ede/detect-utest.el:
+       (ede-detect-utest-project-entries): removed android, compdb, ninja,
+       lein, maven and java-root detection.  (ede-java-root-project):
+       deleted.
+       * test/manual/cedet/cedet/semantic/utest-parse.el:
+       (semantic-utest-C-buffer-contents, semantic-utest-C-name-contents)
+       (semantic-utest-Python-buffer-contents)
+       (semantic-utest-Python-name-contents)
+       (semantic-utest-Scheme-buffer-contents, semantic-utest-Makefile):
+       merged diffs from.
+       * test/manual/cedet/cit-checkenv.el: (cedet-java):
+       deleted.  (cit-checkenv-test): merged diffs from upstream.
+       * test/manual/cedet/cit-cpp.el: (cit-remove-add-to-project-cpp)
+       (cit-remove-and-do-shared-lib): merged diffs from upstream.
+       * test/manual/cedet/cit-cpproot.el: (cit-src-cpproot-main-tags)
+       (cit-cpproot-depfiles, cit-ede-cpproot-test):  merged diffs from
+       upstream.
+       * test/manual/cedet/cit-javaroot.el: deleted
+       * test/manual/cedet/cit-test.sh: deleted
+       * test/manual/cedet/ede-tests.el: deleted
+       * test/manual/cedet/semantic-ia-utest.el: deleted
+       * test/manual/cedet/semantic-tests.el: deleted
+       * test/manual/cedet/semantic-utest-c.el: deleted
+       * test/manual/cedet/semantic-utest.el: deleted
+       * test/manual/cedet/srecode-tests.el: deleted
+       * test/manual/cedet/tests/test.c: deleted
+       * test/manual/cedet/tests/test.el: deleted
+       * test/manual/cedet/tests/test.make: deleted
+       * test/manual/cedet/tests/testdoublens.cpp: deleted
+       * test/manual/cedet/tests/testdoublens.hpp: deleted
+       * test/manual/cedet/tests/testfriends.cpp: deleted
+       * test/manual/cedet/tests/testjavacomp.java: deleted
+       * test/manual/cedet/tests/testnsp.cpp: deleted
+       * test/manual/cedet/tests/testpolymorph.cpp: deleted
+       * test/manual/cedet/tests/testspp.c: deleted
+       * test/manual/cedet/tests/testsppcomplete.c: deleted
+       * test/manual/cedet/tests/testsppreplace.c: deleted
+       * test/manual/cedet/tests/testsppreplaced.c: deleted
+       * test/manual/cedet/tests/testsubclass.cpp: deleted
+       * test/manual/cedet/tests/testsubclass.hh: deleted
+       * test/manual/cedet/tests/testtypedefs.cpp: deleted
+       * test/manual/cedet/tests/testvarnames.c: deleted
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2011-08-20 Eric Ludlam <address@hidden>
+
+       Add header comments and provide.
+
+2013-04-01 Eric Ludlam <address@hidden>
+
+       New Tests for ede-java-root-project type.
+
+2013-08-02 David Engster <address@hidden>
+
+       Revert rev. 6995
+
+       (semantic-analyze-find-tag-sequence-default): Always add scope to the
+       local miniscope for each type.  Otherwise, structure tags are not
+       analyzed correctly.  Also, always search the extended miniscope even
+       when not dealing with types.
+
+       * tests/cedet/semantic/test/manual/cedet/testdoublens.cpp: Add test
+       case for the
+
+       above change.
+
+2013-07-29 David Engster <address@hidden>
+
+       Return fully qualified types if necessary.
+
+       * semantic/analyze/fcn.el (semantic-analyze-type-to-name): If TYPE has
+       a parent, return a fully qualified name.
+
+       * tests/cedet/semantic/test/manual/cedet/testdoublens.cpp: Add test
+       case for the above.
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2011-08-16 xscript <address@hidden>
+
+       Fix typo
+
+       * test/manual/cedet/cedet/semantic/idle.el: Fix typo due to automated
+       file rename ('semantic.elapsed-time' -> 'semantic-elapsed-time).
+
+2011-05-15 xscript <address@hidden>
+
+       Synchronize cedet/semantic with Emacs.
+
+2014-10-24 Eric Ludlam <address@hidden>
+
+       (cit-globalref-test): Note where the test is occuring.
+
+2014-04-20 Eric Ludlam <address@hidden>
+
+       Don't scan other files because Util.cc is already in a buffer
+
+       * test/manual/cedet/cit-globalref.el (cit-globalref-test): Final test,
+       Util.cc is already in a buffer, so we shouldn't scan any other files.
+
+2014-01-01 Eric Ludlam <address@hidden>
+
+       Add test code for use with sources in globalref
+
+       * test/manual/cedet/cit-globalref.el: New test code for use with
+       sources in tests/integ_src/globalref.  Makes sure GNU Global will
+       create tags database, jump to correct impl from a prototype, and
+       also checks how many buffers are opened along the way to make sure
+       the expected number are found.
+
+2014-04-20 Eric Ludlam <address@hidden>
+
+       Fake ver_linux for project detection purposes.
+
+2015-04-11 Eric Ludlam <address@hidden>
+
+       New tests.
+
+2015-10-18 Eric Ludlam <address@hidden>
+
+       Improve test output
+
+       * test/manual/cedet/cedet/semantic/ia-utest.el:
+       (semantic-ia-utest-file-list): Add commented out poly
+       test. (semantic-ia-utest-buffer): Improve visibility of failed lines.
+
+2015-04-22 Eric Ludlam <address@hidden>
+
+       (semantic-ia-utest-file-list): Add testunion.cpp.
+
+2015-04-11 Eric Ludlam <address@hidden>
+
+       Test refactor/move
+
+       * test/manual/cedet/cedet/semantic/ia-utest.el:
+       (semantic-ia-utest-file-list): Add tests/test.texi, test.mk, and
+       test.srt (semantic-ia-utest-buffer, semantic-ia-utest-buffer-refs)
+       (semantic-sr-utest-buffer-refs, semantic-src-utest-buffer-refs): When
+       scanning for comments, wrap comment-start-skip to handle modes that
+       have an unbound or in them. Skip back over whitespace from in front
+       of found test point comments.
+
+2014-11-26 Eric Ludlam <address@hidden>
+
+       (semantic-ia-utest-file-list): add testwisent.wy
+
+2014-02-17 Eric Ludlam <address@hidden>
+
+       Improve test utilities
+
+       * lisp/cedet/semantic/analyze.el:
+       (semantic-analyze-find-tag-sequence-default): If first entry in
+       sequence is the only one, apply tagclass
+       filter. (semantic-analyze-princ-sequence): Show slot even if empty.
+       * tests/cedet/semantic/ia-utest.el: (semantic-ia-utest-file-list): Add
+       testvarnames.java.
+       * tests/cedet/semantic/test/manual/cedet/Project.ede:
+       ("semantic/tests"): Add testvarnames.java
+       * tests/cedet/semantic/test/manual/cedet/testvarnames.java: New test
+       file
+
+2014-02-02 David Engster <address@hidden>
+
+       Add test for parsing local variables
+
+       * tests/cedet/semantic/test/manual/cedet/testlocalvars.cpp: New file.
+       * tests/cedet/semantic/test/manual/cedet/Project.ede: Add above.
+       * tests/cedet/semantic/test/manual/cedet/Makefile: Regenerate.
+       * tests/cedet/semantic/ia-utest.el (semantic-ia-utest-file-list): Add
+       new test file.
+
+2013-07-28 David Engster <address@hidden>
+
+       Remove compatibility function `cedet-called-interactively-p'.
+
+       * lisp/cedet/cedet-compat.el (cedet-called-interactively-p): Remove.
+       It is no longer needed since our minimum version is now 23.2, which
+       has `called-interactively-p'.  Also, remove corresponding unit
+       tests.
+
+       * tests/cedet-utests.el (cedet-utest-test-alist): Remove cedet-compat
+       unit tests.
+
+       * All files: Replace `cedet-called-interactively-p' with
+       `called-interactively-p', providing 'any as argument where it was
+       still missing.
+
+2011-08-20 Eric Ludlam <address@hidden>
+
+       Moved tests about
+
+       * test/manual/cedet/cedet/semantic/ia-utest.el: (cedet-uutil): New
+       require. (semantic-ia-utest): Fix where the test sources are loaded
+       from.  (semantic-symref-test-count-hits-in-tag): Copied from other
+       related src file.
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2013-03-27 Eric Ludlam <address@hidden>
+
+       (priority): Set to a low number. (cit-project-template): New template.
+
+2010-09-15 xscript <address@hidden>
+
+       Remove obsolete cvs-auto-updated 'X-RCS' line.
+
+2008-02-24 zappo <address@hidden>
+
+       Base template for cit testing.
+
+2013-11-04 David Engster <address@hidden>
+
+       Make unit tests use randomized file names
+
+       * tests/cedet/semantic/stltest.el:
+       * tests/cedet/semantic/utest-parse.el:
+       * tests/cedet/srecode/fields-utest.el:
+       * tests/cedet/srecode/test-getset.el:
+       * tests/cedet/srecode/test.el:
+       * tests/eieio/eieio-test-persist.el: Make all those tests use
+       `make-temp-name' for their test files, so that tests can run in
+       parallel.
+
+2011-08-20 Eric Ludlam <address@hidden>
+
+       Fix provide. (cedet-utests): Remove.
+
+2015-04-11 Eric Ludlam <address@hidden>
+
+       New tests.
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2014-10-24 Eric Ludlam <address@hidden>
+
+       Don't fail the test for errors which don't mean a failure
+
+       * test/manual/cedet/cit-externaldb.el: (cit-externaldb-test): Catch
+       failures that shouldn't fail tests.  (cit-externaldb-cleanup): New
+       (cit-gnu-externaldb-test-one): Catch if the create fails from the
+       external program, cleanup, and throw.  Improve fail messages to help
+       identify problems.
+
+2014-10-15 Eric Ludlam <address@hidden>
+
+       (cit-gnu-externaldb-test-one): Improve test for bad search result.
+
+2014-01-01 Eric Ludlam <address@hidden>
+
+       Better skip message
+
+       * test/manual/cedet/cit-externaldb.el: (cit-externaldb-test): Better
+       skip message.  (cit-gnu-externaldb-test-one): Better skip mesasges.
+
+2011-11-07 David Engster <address@hidden>
+
+       * tests/cit-externaldb.el: Fix requires.
+
+       * tests/cit-uml.el: Add require for cogre/uml.
+
+2011-10-06 Darren Hoo <address@hidden>
+
+       Don't set :filename if it's already set
+
+       * test/manual/cedet/cit-externaldb.el:
+       (semanticdb-strip-find-results): Check if there already is a
+       :filename attribute set, so that file information from GNU Global
+       will not be lost.
+
+       * tests/cit-externaldb.el: New test for :filename property.  Make
+       doc-string and comments generic, since this is not specific to GNU
+       global.
+
+2010-09-15 xscript <address@hidden>
+
+       Remove obsolete cvs-auto-updated 'X-RCS' line.
+
+2010-07-25 zappo <address@hidden>
+
+       Use new create functions for db tools
+
+       * test/manual/cedet/cit-externaldb.el: (cit-external-db-tool-list):
+       Change all create fcns for db tools to use new create fcns added for
+       each project type.  (cit-gnu-externaldb-test-one): Change calling
+       convention to create a db to conform to new fcns.
+
+2010-06-13 zappo <address@hidden>
+
+       Fixes for external db tests
+
+       * test/manual/cedet/cit-externaldb.el: (cit-externaldb-files-to-find):
+       Change files to those common between Make and AutoMake.
+       (cit-gnu-externaldb-test-one): Require ede-locate Call
+       `ede-enable-locate-on-project' to start/end the test so that the
+       locate system is available for the project later.
+
+2010-06-13 zappo <address@hidden>
+
+       Test external database tools.
+
+2011-08-20 Eric Ludlam <address@hidden>
+
+       Add header comments and provide.
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2011-08-20 Eric Ludlam <address@hidden>
+
+       Add header comments and provide.
+
+2012-04-22 David Engster <address@hidden>
+
+       (cit-srecode-fill-el): Insert classes before methods.
+
+2010-09-15 xscript <address@hidden>
+
+       Remove obsolete cvs-auto-updated 'X-RCS' line.
+
+2009-10-15 zappo <address@hidden>
+
+       Remove eieio bits and only use eieio bits for make types
+
+       * test/manual/cedet/cit-el.el (cit-el-tags): Removed eieio
+       bits. (cit-el-tags-eieio): New, from above. (cit-srecode-fill-el):
+       Only use eieio bits for Make types.
+
+2009-08-08 zappo <address@hidden>
+
+       Accept the make-tipe argument to control tests
+
+       * test/manual/cedet/cit-el.el (cit-srecode-fill-el): Accept make-type
+       argument.  Don't do autoloads with automake.
+
+2008-02-24 zappo <address@hidden>
+
+       Emacs Lisp support for cedet integration tests.
+
+2015-04-11 Eric Ludlam <address@hidden>
+
+       Added test functions
+
+       * test/manual/cedet/cedet/semantic/utest-c.el: (semantic-utest-c-ede):
+       New (semantic-utest-c): Add call to
+       below. (semantic-utest-c-with-ede): New test function
+       (semantic-utest-c-setup-ede): New.
+
+2011-12-01 David Engster <address@hidden>
+
+       Fix unit testing for several tests and do better error checking.
+
+       * semantic/lex-spp-utests.el (semantic-lex-spp-write-utest):
+       * tests/cedet-utests.el (cedet-utest-eieio-classloader): Throw
+       error if we cannot locate test files.
+
+       * semantic/utest-c.el (semantic-utest-c-compare)
+       (semantic-utest-c-conditionals):
+       * semantic/lex-spp-utest.el (semantic-lex-spp-write-utest): Adapt
+       to new directory structure and do better error checking to avoid
+       silent failures in the future.
+
+2011-08-20 Eric Ludlam <address@hidden>
+
+       Fix provide.
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2015-04-11 Eric Ludlam <address@hidden>
+
+       New tests.
+
+2011-05-15 xscript <address@hidden>
+
+       Synchronize cedet/semantic with Emacs.
+
+2010-09-15 xscript <address@hidden>
+
+       Remove obsolete cvs-auto-updated 'X-RCS' line.
+
+2010-03-16 zappo <address@hidden>
+
+       (cit-make-dist): Use cit-check-compilation-for-error.
+
+2009-12-27 zappo <address@hidden>
+
+       Test updating the project version
+
+       * test/manual/cedet/cit-dist.el: (cit-make-dist): Test w/ default
+       version, then update and test again. (cit-update-version): Force
+       rebuild of Makefile.
+
+2009-12-26 zappo <address@hidden>
+
+       First pass of creating a distribution.
+
+2014-06-21 Eric Ludlam <address@hidden>
+
+       New test C file for linux.
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2012-04-22 David Engster <address@hidden>
+
+       Fix EIEIO methodinvoke-utest and semantic-fmt-utest.
+
+       * Makefile: Add tests/eieio to path for unit tests.
+
+       * tests/cedet-utest.el (cedet/semantic/fmt-utest): Require.
+
+       * tests/cedet/semantic/fmt-utest.el: Fix requires and rename
+       accordingly.
+
+2012-04-21 David Engster <address@hidden>
+
+       Remove useless generated skeleton and old NEWS
+
+       * test/manual/cedet/cedet/semantic/fmt-utest.el Removed useless
+       generated skeleton grammar.  Move old NEWS files and
+       semantic-fmt-utest.
+
+2013-04-01 Eric Ludlam <address@hidden>
+
+       Fix documentation
+
+       * test/manual/cedet/cit-cpproot.el: (cedet-android, ede/android):
+       Deleted useless includes.  (cit-integ-cpproot-srcdir): Doc fix.
+
+2013-03-31 Eric Ludlam <address@hidden>
+
+       Added cpproot tests
+
+       * test/manual/cedet/cit-cpproot.el: (cit-integ-cpproot-sys-subdir):
+       New.  (cit-integ-cpproot-sys-srcdir):
+       New. (cit-src-cpproot-main-tags): Added 3 new
+       tags. (cit-cpproot-depfiles): New. (cit-ede-cpproot-test): Make copy
+       work in emacs 23&24. Add new include dirs Add more spp files. Check
+       all includes that they are found in the expected directories.
+
+2012-12-31 Eric Ludlam <address@hidden>
+
+       New test for testing ede/cpp-root projects.
+
+2014-11-26 Eric Ludlam <address@hidden>
+
+       Tests for completiong symbols in wisent grammars.
+
+2012-12-31 Eric Ludlam <address@hidden>
+
+       New test file.
+
+2011-05-15 xscript <address@hidden>
+
+       Synchronize cedet/semantic with Emacs.
+
+2012-09-12 Eric Ludlam <address@hidden>
+
+       etc/srecode/c.srt: New file, contents from cpp.srt
+
+       etc/srecode/cpp.srt: Delete parts moved to c.srt
+
+       lisp/cedet/ede.el:
+       (ede-configuration-forms-menu): Make robust to cases where there is no
+       current project.
+
+       lisp/cedet/srecode/cpp.el:
+       (srecode-semantic-handle-:c): Renamed from the 
srecode-semantic-handle-:cpp.
+       (srecode-semantic-handle-:cpp): Calls above.
+       (c-mode::srecode-semantic-apply-tag-to-dict): Moved from a cpp-mode
+       function to a c-mode function.  Note this in doc.
+       (srecode-c-apply-templates): Renamed from srecode-cpp-apply-templates
+
+       tests/cit-cpp.el:
+       (cit-plain-c-tags): New variable
+       (cit-srecode-fill-cpp): Insert above into a new file as part of a new 
program.
+
+2011-06-23 David Engster <address@hidden>
+
+       Ensure that the correct buffer is active when
+
+       getting the EDE object
+
+       * test/manual/cedet/cit-cpp.el: (cit-remove-and-do-shared-lib): Make
+       sure we are in the right buffer before getting the current EDE
+       object.
+
+2010-09-15 xscript <address@hidden>
+
+       Remove obsolete cvs-auto-updated 'X-RCS' line.
+
+2010-06-13 zappo <address@hidden>
+
+       Enable global to find hh and hpp files
+
+       * test/manual/cedet/cit-cpp.el: (cit-src-cpp-tags, cit-main-cpp-tags)
+       (cit-srecode-fill-cpp): Switch .hh to .hpp so gnu global can find it.
+
+2010-05-16 zappo <address@hidden>
+
+       (cit-remove-and-do-shared-lib): Add ldlibs-local test.
+
+2010-05-16 zappo <address@hidden>
+
+       Use ldflags and libs for in project libraries
+
+       for automake
+
+       * test/manual/cedet/cit-cpp.el: (cit-remove-and-do-shared-lib): For
+       automake, use ldflags, and ldlibs for in project libraries.
+
+2010-04-18 zappo <address@hidden>
+
+       Added code for test tags
+
+       * test/manual/cedet/cit-cpp.el: (cit-header-cpp-tags): Add some code
+       to foo constructor. (cit-src-cpp-tags): Add stdio.h include. Add code
+       to the methods to call through the class and eventually print
+       MOOSE. (cit-main-cpp-tags): Remove stdio.h include. Replace print
+       code with call to the foo class to print
+       MOOSE. (cit-symref-operations): New variable.
+       (cit-remove-add-to-project-cpp): Delete .o files also.
+       (cit-remove-and-do-shared-lib): Specify the compiler to use.
+
+2010-03-16 zappo <address@hidden>
+
+       Improve compilation active detection
+
+       * test/manual/cedet/cit-cpp.el: (cit-remove-add-to-project-cpp)
+       (cit-remove-and-do-shared-lib): Use cit-wait-for-compilation and
+       cit-check-compilation-for-error.
+
+2009-10-18 zappo <address@hidden>
+
+       Run the code for the compiled binary
+
+       * test/manual/cedet/cit-cpp.el: (cit-main-cpp-tags): Add code to main.
+       (cit-srecode-fill-cpp): Run the compiled program.
+
+2009-10-15 zappo <address@hidden>
+
+       (cit-remove-and-do-shared-lib): Enable for use with Make projects too. 
Create the srcs in a new lib directory.
+
+2009-09-14 zappo <address@hidden>
+
+       (cit-remove-and-do-shared-lib): New.
+
+2009-08-08 zappo <address@hidden>
+
+       New make-type argument to control which include
+
+       variable is used
+
+       * test/manual/cedet/cit-cpp.el: (cit-srecode-fill-cpp): Accept
+       make-type argument.  Control how projects are made based on what
+       include variable is used based on above.
+
+2009-03-12 zappo <address@hidden>
+
+       Patch from David Engster
+
+       * test/manual/cedet/cit-cpp.el: (cit-remove-add-to-project-cpp): Use
+       ede-make-command
+
+2009-03-06 zappo <address@hidden>
+
+       (cit-remove-add-to-project-cpp): Wait for make to finish.
+
+2009-01-10 zappo <address@hidden>
+
+       (cit-srecode-fill-cpp): Fixed misspelling of target name.
+
+2008-02-24 zappo <address@hidden>
+
+       CPP integration support. Core bits copied originally from 
cedet-integ-test.el
+
+2013-12-30 Eric Ludlam <address@hidden>
+
+       Added more test data
+
+       * test/manual/cedet/cedet/semantic/tests/testvarnames.c:
+       (varorstruct): New struct and variable.  (assigntovarorstruct): New
+       variable that doesn't start with 'var'. (test_1): Add test when
+       assigning into varorstruct that we get a match.
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2013-11-04 David Engster <address@hidden>
+
+       Make unit tests use randomized file names
+
+       * tests/cedet/semantic/stltest.el:
+       * tests/cedet/semantic/utest-parse.el:
+       * tests/cedet/srecode/fields-utest.el:
+       * tests/cedet/srecode/test-getset.el:
+       * tests/cedet/srecode/test.el:
+       * tests/eieio/eieio-test-persist.el: Make all those tests use
+       `make-temp-name' for their test files, so that tests can run in
+       parallel.
+
+2011-08-20 Eric Ludlam <address@hidden>
+
+       Force srecode repo location and add decorations to debug output
+
+       * test/manual/cedet/cedet/srecode/test.el: (cl, cedet-uutil): New
+       require (cedet-utests): Deleted require. (srecode-map-load-path):
+       Force the srecode repository location in.  (srecode-utest-map-reset):
+       New test fcn. (srecode-utest-test): Add decorations to debug
+       output. (cedet/srecode/test): Fix require.
+
+2011-06-01 xscript <address@hidden>
+
+       Synchronize cedet/srecode with Emacs.
+
+2013-11-04 David Engster <address@hidden>
+
+       Make unit tests use randomized file names
+
+       * tests/cedet/semantic/stltest.el:
+       * tests/cedet/semantic/utest-parse.el:
+       * tests/cedet/srecode/fields-utest.el:
+       * tests/cedet/srecode/test-getset.el:
+       * tests/cedet/srecode/test.el:
+       * tests/eieio/eieio-test-persist.el: Make all those tests use
+       `make-temp-name' for their test files, so that tests can run in
+       parallel.
+
+2011-08-20 Eric Ludlam <address@hidden>
+
+       Add header comments and provide.
+
+       * test/manual/cedet/cedet/srecode/fields-utest.el:
+       (srecode-field-utest-impl): Use standard Emacs overlay commands.
+
+2014-10-24 Eric Ludlam <address@hidden>
+
+       New setup testing.
+
+2013-11-18 David Engster <address@hidden>
+
+       C++: Deal with 'using' statements when calculating scope
+
+       * semantic/bovine/c.el (semantic-ctxt-scoped-types): Go through all
+       tags around point and search them for using statements.  Before, we
+       skipped the last one thinking that it would have to be function, but
+       it could also be a type.
+
+       * semantic/scope.el (semantic-completable-tags-from-type): When
+       creating the list of completable types, pull in types which are
+       referenced through 'using' statements.
+
+       * tests/cedet/semantic/test/manual/cedet/testusing.cpp:
+       * tests/cedet/semantic/test/manual/cedet/testusing.hh: Add tests for
+       the above.
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2015-01-21 Ramkumar Ramachandra <address@hidden>
+
+       semantic/bovine/c: Parse C++11 strongly typed enum
+
+       * semantic/bovine/c.by (ENUM, opt-enum-type): Add opt-enum-type argument
+       to ENUM, that matches either a colon + typeformbase or nothing.
+
+       * semantic/bovine/c.el (semantic-c-reconstitute token): Add :enum-type.
+
+2015-01-17 Ramkumar Ramachandra <address@hidden>
+
+       semantic/bovine/c: Parse C++ override/final correctly
+
+       override and final are a perfectly good opt-post-fcn-modifiers in
+       C++. Parse them correctly.  (Tiny change)
+
+       * semantic/bovine/c.by (post-fcn-modifiers): Add tokens OVERRIDE and
+       FINAL.
+
+       * semantic/bovine/c.el (semantic-c-reconstitute-token): Add
+       :override-flag and :final-flag.
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2014-04-20 Eric Ludlam <address@hidden>
+
+       Fake emacs.c for project detection purposes.
+
+2014-06-03 Eric Ludlam <address@hidden>
+
+       Erorr when appropriate
+
+       * test/manual/cedet/cedet-uutil.el: (cedet-utest-log-shutdown): This
+       should error when there are errors. (cedet-utest-log): Doc fix.
+
+2011-08-20 Eric Ludlam <address@hidden>
+
+       New file, derived from logging functions in cedet-utest.el
+
+2013-11-18 David Engster <address@hidden>
+
+       C++: Deal with 'using' statements when calculating scope
+
+       * semantic/bovine/c.el (semantic-ctxt-scoped-types): Go through all
+       tags around point and search them for using statements.  Before, we
+       skipped the last one thinking that it would have to be function, but
+       it could also be a type.
+
+       * semantic/scope.el (semantic-completable-tags-from-type): When
+       creating the list of completable types, pull in types which are
+       referenced through 'using' statements.
+
+       * tests/cedet/semantic/test/manual/cedet/testusing.cpp:
+       * tests/cedet/semantic/test/manual/cedet/testusing.hh: Add tests for
+       the above.
+
+2013-09-18 David Engster <address@hidden>
+
+       C/C++: Parse 'using' statements in the correct order.
+
+       (c++-mode:semantic-ctxt-scoped-types): In the case for using
+       statements outside of function scope, append them in the correct order
+       instead of using 'cons'.  This is important since using statements may
+       depend on previous ones.
+
+       * tests/cedet/semantic/test/manual/cedet/testusing.cpp: Add test for
+       the above.
+
+2013-09-15 David Engster <address@hidden>
+
+       Another 'using namespace' fix
+
+       (semantic-analyze-scoped-types-default): If we cannot find a type in
+       the typecache, also look into the the types we already found.  This is
+       necessary since in C++, a 'using namespace' can be dependend on a
+       previous one.
+
+       * testusing.cpp: Add test for the above.
+
+2012-10-25 David Engster <address@hidden>
+
+       Simplify alias referencing and add tests.
+
+       * lisp/cedet/semantic/analyze.el (semantic-analyze-dereference-alias):
+       Only dereference first tag, since at least for C++ this is enough.
+       (semantic-analyze-current-context-default): Adapt comment.
+
+       * tests/cedet/semantic/test/manual/cedet/testusing.cpp: Add tests for
+       the above.
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2015-04-11 Eric Ludlam <address@hidden>
+
+       New test files combining macros and EDE
+
+2015-03-08 Alastair Rankine <address@hidden>
+
+       Add compdb EDE project
+
+       - Unit tests incorporated into cedet-utest, all passing
+       - Documentation still pending
+
+2015-01-31 David Engster <address@hidden>
+
+       eieio: Move to obsolete and use the one that ships with Emacs
+
+       * lisp/eieio: Move to obsolete.
+
+       * etc/fallback-libraries: Add eieio fallback libraries.
+
+       * Makefile (top-level): Remove eieio compilation and add compilation of
+       fallback eieio for Emacs 24.1 and 24.2. Throw error for Emacs 23.x.
+
+       * cedet-devel-load.el: Always require eieio at the top.  Load
+       cedet-compat earlier.  Remove advices for eieio helpers.
+
+       * cedet-remove-builtin.el: eieio must not be removed anymore.
+
+       * semantic/ede-grammar.el (semantic-ede-proj-target-grammar): Remove
+       cedet-compat from aux-packages initform, as it will be loaded by
+       cedet-devel-load anyway.
+       (ede-proj-makefile-insert-variables): Remove eieio from load-path.
+
+       * lisp/cedet/cedet-compat.el: Load fallback eieio for Emacs 24.1 and
+       24.2.  Add new aliases for Emacs 24.3.
+
+       * Project.ede, Makefiles: Remove eieio and regenerate.
+
+       * tests: Remove eieio tests.
+
+2015-01-26 Eric Ludlam <address@hidden>
+
+       (cedet-utest-test-alist): Add ede-detect-linux-utest.
+
+2015-01-25 David Engster <address@hidden>
+
+       Tests: Add ERT test for the C Bovinator
+
+       * tests/cedet-utests.el (cedet/semantic/ert/test-c-parser): Require.
+       (cedet-utest-test-alist): Add new ERT test.
+
+       * tests/cedet/semantic/ert/test-c-parser.el: New file for testing the C
+       Bovinator. This tests the newly added typed enum rule.
+
+2014-10-21 Eric Ludlam <address@hidden>
+
+       Added security test
+
+       * test/manual/cedet/cedet-utests.el: (cedet/ede/secure-utest): New
+       require (cedet-utest-test-alist): Add ede-security-utest
+
+2014-05-21 Eric Ludlam <address@hidden>
+
+       (cedet-utest): Add EDE sanity check to the end.
+
+2014-04-20 Eric Ludlam <address@hidden>
+
+       Adedd `ede-detect-utest'
+
+       * test/manual/cedet/cedet-utests.el: (cedet/ede/detect-utest): New
+       require.  (cedet-utest-test-alist): Add ede-detect-utest.
+
+2013-04-06 Eric Ludlam <address@hidden>
+
+       (cedet-utest-batch): Disable saving EDE's cache file.
+
+2012-04-22 David Engster <address@hidden>
+
+       Fix EIEIO methodinvoke-utest and semantic-fmt-utest.
+
+       * Makefile: Add tests/eieio to path for unit tests.
+
+       * tests/cedet-utest.el (cedet/semantic/fmt-utest): Require.
+
+       * tests/cedet/semantic/fmt-utest.el: Fix requires and rename
+       accordingly.
+
+2012-04-22 David Engster <address@hidden>
+
+       Fix merge error in unit tests.
+
+2011-12-01 David Engster <address@hidden>
+
+       Fix unit testing for several tests and do better error checking.
+
+       * semantic/lex-spp-utests.el (semantic-lex-spp-write-utest):
+       * tests/cedet-utests.el (cedet-utest-eieio-classloader): Throw
+       error if we cannot locate test files.
+
+       * semantic/utest-c.el (semantic-utest-c-compare)
+       (semantic-utest-c-conditionals):
+       * semantic/lex-spp-utest.el (semantic-lex-spp-write-utest): Adapt
+       to new directory structure and do better error checking to avoid
+       silent failures in the future.
+
+2011-11-27 David Engster <address@hidden>
+
+       Fix interactive unit tests.
+
+       * pulse-utest.el (pulse-test): Use normal overlay functions.
+
+       * cedet-utests.el (chart): Require.
+
+2011-11-01 David Engster <address@hidden>
+
+       Use `cedet-version' instead of `cedet-version-print'
+
+       * tests/cedet-utest.el: (cedet-utest-test-alist): Replace
+       `cedet-version-print' with `cedet-version.
+
+2011-08-20 Eric Ludlam <address@hidden>
+
+       Refactor tests
+
+       * test/manual/cedet/cedet-utests.el: (cedet-uutil): New require, plus
+       all other unit test files. (cedet-utest-test-alist): eieio now has
+       loader test fcn (below) Re-order srecode
+       tests. (cedet-running-master-tests): Move to cedet-uutil.
+       (cedet-utest): Fix symbol names for initializing the test suite.
+       (cedet-utest-noninteractive): Move to
+       cedet-uutil. (cedet-utest-batch): Init semantic the new
+       way. (cedet-utest-frame, cedet-utest-last-log-item,
+       cedet-utest-log-timer) (cedet-utest-log-setup,
+       cedet-utest-elapsed-time) (cedet-utest-log-shutdown,
+       cedet=utest-log-shutdown-msg) (cedet-utest-show-log-end,
+       cedet-utest-post-command-hook) (cedet-utest-add-log-item-start,
+       cedet-utest-add-log-item-done) (cedet-utest-log-start,
+       cedet-utest-log): Moved to cedet-util.el
+       (cedet-utest-eieio-classloader): New loader for the EIEIO tests.
+
+2015-04-22 Eric Ludlam <address@hidden>
+
+       New test file for unions.
+
+2013-11-04 David Engster <address@hidden>
+
+       Make unit tests use randomized file names
+
+       * tests/cedet/semantic/stltest.el:
+       * tests/cedet/semantic/utest-parse.el:
+       * tests/cedet/srecode/fields-utest.el:
+       * tests/cedet/srecode/test-getset.el:
+       * tests/cedet/srecode/test.el:
+       * tests/eieio/eieio-test-persist.el: Make all those tests use
+       `make-temp-name' for their test files, so that tests can run in
+       parallel.
+
+2011-08-20 Eric Ludlam <address@hidden>
+
+       Fix provide. (cedet-uutil, srecode/semantic): New requires.
+
+2011-06-01 xscript <address@hidden>
+
+       Synchronize cedet/srecode with Emacs.
+
+2011-06-01 xscript <address@hidden>
+
+       Synchronize cedet/srecode with Emacs.
+
+2011-08-02 Eric Ludlam <address@hidden>
+
+       (Cit-Android): New Require. (Cedet-Integ-Test-Gnustep): Fix Typo. 
(Cedet-Integ-Test-Android): New Build Type Support For Android. (Cit-Make-Dir): 
Allow Making Trees Of Directories. (Cit-Compile-And-Wait): Only Regenerate The 
Project If That Project Type Can Be Regenerated. 
(Cit-Compile-And-Wait-Using-Ede-Command): New Way To Build That Uses Ede 
Commands Instead Of Hard-Coded Make Commands.
+
+2010-10-19 David Engster <address@hidden>
+
+       Ignore Members On Extra Tags
+
+       * Test/Manual/Cedet/Cedet-Integ-Test.El (Cit-Srecode-Verify-Tags):
+       Ignore Members Attribute For Extra Tags.  Necessary Because Of The
+       Latest Changes To Semantic-Tag-Similar-P.
+
+2010-10-18 Eric Ludlam <address@hidden>
+
+       Compare Code And Documtation For Tags
+
+       * Test/Manual/Cedet/Cedet-Integ-Test.El (Cit-Srecode-Verify-Tags):
+       When Comparing Tags, Add To Ignored Attribs, :Code And
+       :Documentation.
+
+2010-06-13 zappo <address@hidden>
+
+       Call external db testing suite
+
+       * test/manual/cedet/cedet-integ-test.el (Cit-Externaldb): New Require
+       (Cedet-Integ-Test-Proj): Call To Externaldb Testing Suite.
+
+2010-04-18 zappo <address@hidden>
+
+       Disable auto add, do shared-library-only test
+
+       for automake and show output
+
+       * test/manual/cedet/cedet-integ-test.el (cit-symref): New require.
+       (cedet-integ-test-proj): Disable auto add.  Only do shared library
+       test with automake.  (cit-run-target): Don't kill the buffer, wait
+       and show program output instead.
+
+2010-03-16 zappo <address@hidden>
+
+       Improve compilation error checking
+
+       * test/manual/cedet/cedet-integ-test.el (cit-compile-and-wait): Pull
+       out error checking. Add support for stripping erroneous
+       events. (cit-check-compilation-for-error): New, from above.
+
+2009-12-26 zappo <address@hidden>
+
+       Move compilation error handling to new function
+
+       * test/manual/cedet/cedet-integ-test.el (cit-dist): New require.
+       (cedet-integ-test-proj): Call new cit-dist tests.
+       (cit-compile-and-wait): Split part out to...
+       (cit-wait-for-compilation): New.
+
+2009-10-18 zappo <address@hidden>
+
+       Insert tag's code if it's there
+
+       * test/manual/cedet/cedet-integ-test.el (cit-srecode-fill-with-stuff):
+       If a tag has :code, insert it. (cit-run-target): New.
+
+2009-10-15 zappo <address@hidden>
+
+       Added lib dir and make-type argument
+
+       * test/manual/cedet/cedet-integ-test.el (cedet-integ-test-proj): Add a
+       lib dir.  Add make-type arg to cit-remove-and-do-shared-lib call.
+       (cit-compile-and-wait): Accept an optional argument.
+
+2009-09-14 zappo <address@hidden>
+
+       (cedet-integ-test-proj): Add cit-remove-and-do-shared-lib.
+
+2009-08-08 zappo <address@hidden>
+
+       (cit-finish-message): Add a pause, then exit with a status of "1".
+
+2009-08-08 zappo <address@hidden>
+
+       
(cedet-integ-test-Make,cedet-integ-test-Automake,cedet-integ-test-GNUStep): New 
(cedet-integ-test-proj): Take a make-type argumemt. Misc tests needed on new 
argument. Change how ede creates projects based on make-type. Remove spaces 
from the project name. (cit-finish-message): Ending message now includes the 
make type.
+
+2009-05-30 zappo <address@hidden>
+
+       Added cit uml
+
+       * test/manual/cedet/cedet-integ-test.el (cit-uml): New require
+       (cogre): New require (cedet-integ-test): Make a UML test dir. Call
+       `cit-fill-uml'.  (cit-compile-and-wait): Kill Project.ede buffer
+       after compilation.
+
+2009-03-12 zappo <address@hidden>
+
+       Added new subdir and ensure that the base dir
+
+       is made first
+
+       * test/manual/cedet/cedet-integ-test.el (cedet-integ-base): New, using
+       old target value.  (cedet-integ-target): Subdir under base
+       (cedet-integ-test): Make the base dir first.
+       (cit-srecode-verify-tags): Fix paren typos on error condition.
+
+2009-03-12 zappo <address@hidden>
+
+       Set the auto-add-method to always during test
+
+       steps
+
+       * test/manual/cedet/cedet-integ-test.el
+       (cit-remove-add-to-project-cpp): Set auto-add-method to always during
+       step test.
+
+2009-03-12 zappo <address@hidden>
+
+       (ede, ede-make): New require (cit-srecode-verify-tags): Fix debugging 
output on failure. Patch from David Engster (cit-compile-and-wait): Use 
ede-make-command
+
+2009-01-24 zappo <address@hidden>
+
+       (cit-version): New variable. (semantic): New require
+
+2008-08-28 safanaj <address@hidden>
+
+       Added gnustep tests
+
+       * test/manual/cedet/cedet-integ-test.el Added stuff to test
+       ede-gnustep via `cit-ede-step-test' defined in cit-gnustep.el.
+       Something is not clear (ede-auto-add-method ???)
+
+2008-08-23 zappo <address@hidden>
+
+       Add whitespace at the end of a filled buffer
+
+       * test/manual/cedet/cedet-integ-test.el (cit-srecode-fill-with-stuff):
+       Protect erase-buffer call. Add extra whitespace at end of empty
+       filled buffers.
+
+2008-03-11 zappo <address@hidden>
+
+       (cedet-integ-test): Post a PASSED message.
+
+2008-02-24 zappo <address@hidden>
+
+       (cit-srec): New require (cedet-integ-test): Call srec test.
+
+2008-02-24 zappo <address@hidden>
+
+       Restructure and improve output
+
+       * test/manual/cedet/cedet-integ-test.el (cit-cpp,-el,-texi): Added
+       requires.  (cedet-integ-test): Add in new calls to test support
+       files. (cit-header-tags, cit-src-tags, cit-main-tags,
+       cit-srecode-fill): Moved to cit-cpp.el (cit-srecode-fill-with-stuff):
+       Add empty-dict-entries argument. Add pauses for visual
+       effect. (cit-srecode-verify-tags): Fix to work, and actually throw an
+       error if things don't match up. (cit-tag-verify-error-debug): New
+       support class. (cit-compile-and-wait): New fcn.  Error if compilation
+       fails.
+
+2008-02-19 zappo <address@hidden>
+
+       Update comments
+
+       * test/manual/cedet/cedet-integ-test.el (cedet-integ-test)
+       (cit-srecode-fill, cit-srecode-fill-with-stuff): Updated comments.
+
+2008-02-19 zappo <address@hidden>
+
+       Integration Tests.
+
+2014-11-24 Eric Ludlam <address@hidden>
+
+       Test typedef which has the keyword "class" included
+
+       * test/manual/cedet/cedet/semantic/tests/testtypedefs.cpp:
+       (NS2::Myclass, MyClassHandle, dixon): New test w/ a typedef that has
+       keyword "class" included, instead of omitted as with other tests.
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2014-05-23 Eric Ludlam <address@hidden>
+
+       sample lib srces for dirmatch tests.
+
+2011-08-20 Eric Ludlam <address@hidden>
+
+       Add comments, require cedet-files.
+
+2011-04-19 xscript <address@hidden>
+
+       Synchronize base 'cedet' with Emacs
+
+2015-10-18 Eric Ludlam <address@hidden>
+
+       (isFooLike, A, B, main2): New test tweaked from example by Liang Wang
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2013-09-20 David Engster <address@hidden>
+
+       Fix parsing of default values and display them in default formatter
+
+       * semantic/bovine/c.by (variablearg, varnamelist): Add default values
+       so that it can be later expanded into the tag.
+       (opt-stuff-after-symbol): Rename to 'brackets-after-symbol' and
+       remove empty match.
+       (multi-stage-dereference): Adapt to above rename.
+       (unaryexpression): Use 'symbol' instead of 'namespace-symbol', since
+       the latter also leads to an empty match at the end which would make
+       this too greedy.
+
+       * semantic/format.el (semantic-format-tag-prototype-default):
+       Display default values if available.
+
+       * semantic/test/manual/cedet/test-fmt.cpp: Add default values.
+
+       Parsing of default values for variables and function arguments was
+       broken with the refactoring done in rev. 7622.  While fixing this, it
+       turned out that our parser for expressions like
+
+       char *foo = NULL;
+
+       was too greedy and also covered the semicolon because of empty matches
+       in rules 'opt-stuff-after-symbol' and 'opt-template-specifier',
+       leading to a variable with a default-value of "NULL;". This was fixed
+       by removing the empty match in 'opt-stuff-after-symbol' and using
+       'symbol' instead of 'namespace-symbol'.
+
+2015-04-03 Alastair Rankine <address@hidden>
+
+       compdb: add project detection tests
+
+2015-03-22 Eric Ludlam <address@hidden>
+
+       (ede-detect-utest-init-dirmatch): Force the dirmatch configdatastash to 
be unbound to force arduino to flush any cached values.
+
+2015-02-15 David Engster <address@hidden>
+
+       tests: Fix typo in ede/detect-utest
+
+       This worked by chance on Emacs 24.x, but breaks on Emacs 25.
+       *  test/manual/cedet/cedet/ede/detect-utest.el
+
+2014-10-18 Eric Ludlam <address@hidden>
+
+       Add a final call to ede list sanity check
+
+       * test/manual/cedet/cedet/ede/detect-utest.el:
+       (ede-detect-utest-loop): Add a final call to
+       `ede-global-list-sanity-check'.
+
+2014-08-24 Eric Ludlam <address@hidden>
+
+       detect-utest.el: (ede-detect-utest-configdir): New fcn 
(ede-detect-utest-arduino-install): New faux install dir 
(ede-detect-utest-init-dirmatch): Point at fake intalldir to get fake board.
+
+2014-06-21 Eric Ludlam <address@hidden>
+
+       Fixes for test execution
+
+       * test/manual/cedet/cedet/ede/detect-utest.el: (ede-detect-entry):
+       Remove `found-state' slot as it was unused. (ede-detect-show-state):
+       When an error in init, show it.  (ede-detect-utest-project-entries):
+       Add a linux driver test added where this dir would detect as generic
+       makefile, but it is in Linux.  (ede-detect-utest-loop): Add better
+       failed load message.
+
+2014-06-05 Eric Ludlam <address@hidden>
+
+       (ede-detect-utest): Re-run tests with inode optimization disabled.
+
+2014-06-03 Eric Ludlam <address@hidden>
+
+       Major test restructure
+
+       * test/manual/cedet/cedet/ede/detect-utest.el:
+       (ede-ditect-utest-project-list): Deleted.  Replaced
+       with... (ede-detect-utest-project-entries): New list of entries to
+       test.  (ede-detect-utest-project-dirmatch-list): Deleted.  Replaced
+       with ...  (ede-detect-utest-project-dirmatch-entries): New list of
+       entries to test dirmatch with. (ede-detect-entry): New class for
+       storing test points.  (ede-detect-entry::ede-detect-do-test)
+       (ede-detect-show-state, ede-detect-entry::ede-detect-state)
+       (ede-detect-entry::ede-detect-show-progress): New. ("UTESTCPP",
+       "UTESTJAVA"): Add :name to these projects. (ede-detect-utest):
+       Replace feature unloaded/loaded with calls to
+       `ede-detect-utest-validate-loadstate'. Change variables passed to
+       utest-loop. (ede-detect-utest-loop): Replace old refs into cons cells
+       with refs into the class.  Replace all bit warnings by pushing text
+       into the test entry objects.  Add double-initialze test.  Add call to
+       project rescan.  At end, dump out the state captured during testing.
+       (ede-detect-utest-rescan):
+       New. (ede-detect-utest-validate-loadstate): New, content copied from
+       `ede-detect-utest'. (dirmatchtest autoload): Add root-only as nil.
+
+2014-05-31 Eric Ludlam <address@hidden>
+
+       (ede-detect-utest-project-list): Add test for generic VC type project. 
(ede-detect-utest): Add fake autoloader for VC. 
(ede-detect-utest-generic-vc-p): New.
+
+2014-05-31 Eric Ludlam <address@hidden>
+
+       (ede-detect-utest-project-list): Add jvm-base projects for ant, lein, 
maven
+
+2014-05-30 Eric Ludlam <address@hidden>
+
+       Additions to generic project testing
+
+       * test/manual/cedet/cedet/ede/detect-utest.el:
+       (ede-detect-utest-project-list): Add 3 generic project detection
+       tests. (ede-detect-utest): Enable generic project types.
+       (ede-detect-utest-generic-p): New predicate.
+
+2014-05-23 Eric Ludlam <address@hidden>
+
+       Added arduino project detection
+
+       * test/manual/cedet/cedet/ede/detect-utest.el:
+       (ede-detect-utest-project-dirmatch-list): Add arduino.  Add subdir
+       tests for dirmatch and arudino. (ede-detect-utest): Also test for
+       arduino lib not loading/loading. (ede-detect-utest-arduino-fname):
+       New.  (ede-detect-utest-init-dirmatch): Reconfigure for reading
+       arduino data out of temp created config files.
+
+2014-05-23 Eric Ludlam <address@hidden>
+
+       Additions to detection testing
+
+       * test/manual/cedet/cedet/ede/detect-utest.el:
+       (ede-detect-utest-project-list): Doc fix
+       (ede-detect-utest-project-dirmatch-list): New (ede-detect-utest):
+       Split out body.  Pull up start/end logging. Add testing for dirmatch
+       not loaded/loaded.  Add testing for the dirmatch project.
+       (ede-detect-utest-loop): Previous content of above.
+
+2014-05-21 Eric Ludlam <address@hidden>
+
+       (ede-detect-utest): Change message formatting.
+
+2014-05-18 Eric Ludlam <address@hidden>
+
+       Added cpproot and java root to detection tests
+
+       * test/manual/cedet/cedet/ede/detect-utest.el:
+       (ede-detect-utest-project-list): Add cpproot and javaroot. Add sub
+       dirs under project and automake types.  (ede-detect-utest-basedir):
+       New function (UTESTCPP, UTESTJAVA): New.  (ede-detect-utest): Improve
+       debug output for failed tests.  (ede-detect-utest-subproj-p,
+       ede-detect-utest-subautomake-p): New.
+
+2014-04-20 Eric Ludlam <address@hidden>
+
+       New unit test for EDE project detection.
+
+2014-05-31 Eric Ludlam <address@hidden>
+
+       Test project file.
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2015-01-25 David Engster <address@hidden>
+
+       semantic/bovine/c: Add support for typedef references
+
+       * semantic/bovine/c.by (typedefname): Also parse optional
+       reference qualifier.
+
+       * semantic/bovine/c.el (semantic-expand-c-tag-namelist): Add :reference
+       attribute for typedefs.
+
+       * tests/cedet/semantic/ert/test-c-parser.el: Add tests for typedefs.
+
+2015-01-25 David Engster <address@hidden>
+
+       Tests: Add ERT test for the C Bovinator
+
+       * tests/cedet-utests.el (cedet/semantic/ert/test-c-parser): Require.
+       (cedet-utest-test-alist): Add new ERT test.
+
+       * tests/cedet/semantic/ert/test-c-parser.el: New file for testing the C
+       Bovinator. This tests the newly added typed enum rule.
+
+2014-06-03 Eric Ludlam <address@hidden>
+
+       Fix how the target file name is created
+
+       * test/manual/cedet/cedet/ede/detect-dirtest.el (ede-dirmatch-load):
+       Fix how target file name was created. (project-rescan): New.
+
+2014-05-23 Eric Ludlam <address@hidden>
+
+       New EDE project for testing dirmatch features.
+
+2014-01-01 Eric Ludlam <address@hidden>
+
+       Test files contributed by Barry OReilly
+
+       * test/manual/cedet/integ_src/globalref/inc/Util.hh: These test files
+       contributed by Barry OReilly, modified for use in the automated tests
+       for CEDET, and with additional comments.  inc/Util.hh, src/Util.cc:
+       Search symbol both in and outside of namespaces.
+
+2013-02-28 David Engster <address@hidden>
+
+       Test `this' from in inline member functions
+
+       * tests/cedet/semantic/test/manual/cedet/testsubclass.cpp: Add test
+       for 'this' in inline member function.
+
+2013-02-28 David Engster <address@hidden>
+
+       Make 'this' a pointer.
+
+       * semantic/bovine/c.el (semantic-get-local-variables): The variable
+       'this' has to be a pointer.
+
+       * tests/cedet/semantic/test/manual/cedet/testsubclass.cpp: Adapt test
+       accordingly.
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2011-05-15 xscript <address@hidden>
+
+       Synchronize cedet/semantic with Emacs.
+
+2014-01-01 Eric Ludlam <address@hidden>
+
+       Tests contributed by Barry OReilly
+
+       * test/manual/cedet/integ_src/globalref/src/Util.cc: These test files
+       contributed by Barry OReilly, modified for use in the automated tests
+       for CEDET, and with additional comments.  inc/Util.hh, src/Util.cc:
+       Search symbol both in and outside of namespaces.
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2011-05-15 xscript <address@hidden>
+
+       Synchronize cedet/semantic with Emacs.
+
+2011-05-15 xscript <address@hidden>
+
+       Synchronize cedet/semantic with Emacs.
+
+2014-05-18 Eric Ludlam <address@hidden>
+
+       Test file for Project.ede proj.
+
+2013-10-27 David Engster <address@hidden>
+
+       Expand preprocessor to handle macros which open or close scope.
+
+       * semantic/lex-spp.el (semantic-c-end-of-macro): Declare.
+       (semantic-lex-spp-token-macro-to-macro-stream): Deal with macros which
+       open/close a scope.  For this, leave an overlay if we encounter a
+       single open paren and return a semantic-list in the lexer.  When this
+       list gets expanded, retrieve the old position from the overlay.  See
+       the comments in the function for further details.
+       (semantic-lex-spp-find-closing-macro): New function to find the next
+       macro which closes scope (i.e., has a closing paren).
+       (semantic-lex-spp-replace-or-symbol-or-keyword): Go to end of closing
+       macro if necessary.
+       (semantic-lex-spp-paren-or-list): New lexer to specially deal with
+       parens in macro definitions.
+
+       * bovine/c.el (semantic-cpp-lexer): Use new
+       `semantic-lex-spp-paren-or-list'.
+
+       * tests/cedet/semantic/test/manual/cedet/testsppreplace.c:
+       * tests/cedet/semantic/test/manual/cedet/testsppreplaced.c: Add tests 
for the
+       above.
+
+2013-10-19 David Engster <address@hidden>
+
+       C/C++: Fix function pointer parsing
+
+       * semantic/bovine/c.by (variablearg-opt-name): Support parsing of
+       function pointers inside an argument list.
+
+       * semantic/bovine/c.el (semantic-c-reconstitute-token): Change
+       handling of function pointers; instead of seeing them as variables,
+       handle them as functions with a 'function-pointer' attribute.  Also,
+       correctly deal with function pointers as function arguments.
+       (semantic-c-reconstitute-function-arglist): New function to parse
+       function pointers inside an argument list.
+       (semantic-format-tag-name): Use 'function-pointer' attribute instead
+       of the old 'functionpointer-flag'.
+
+       * tests/cedet/semantic/test/manual/cedet/testsppreplace.c:
+       * tests/cedet/semantic/test/manual/cedet/testsppreplaced.c: Disable
+       test which now breaks due to improved function pointer parsing.
+       This test is broken anyway, since it just succeeded because the
+       argument list was not parsed at all before this commit.  The
+       underlying bug was always present in the semantic preprocessor.
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2013-11-04 David Engster <address@hidden>
+
+       Improve test utilities re complation and deletion
+
+       * tests/cedet-integ-test.el (cit-check-compilation-for-error): Use
+       correct format-string.
+       * cedet/semantic/stltest.el: Only delete test file if it exists (which
+       it shouldn't do, but still...).
+
+2013-11-04 David Engster <address@hidden>
+
+       Make unit tests use randomized file names
+
+       * tests/cedet/semantic/stltest.el:
+       * tests/cedet/semantic/utest-parse.el:
+       * tests/cedet/srecode/fields-utest.el:
+       * tests/cedet/srecode/test-getset.el:
+       * tests/cedet/srecode/test.el:
+       * tests/eieio/eieio-test-persist.el: Make all those tests use
+       `make-temp-name' for their test files, so that tests can run in
+       parallel.
+
+2012-10-27 David Engster <address@hidden>
+
+       Added new file to test completion on STL classes and namespace.
+
+       * tests/cedet/semantic/stltest.el: New file to test completion on STL
+       classes and namespace.
+
+2011-05-15 xscript <address@hidden>
+
+       Synchronize cedet/semantic with Emacs.
+
+2014-05-30 Eric Ludlam <address@hidden>
+
+       New test file.
+
+2013-10-27 David Engster <address@hidden>
+
+       Expand preprocessor to handle macros which open or close scope.
+
+       * semantic/lex-spp.el (semantic-c-end-of-macro): Declare.
+       (semantic-lex-spp-token-macro-to-macro-stream): Deal with macros which
+       open/close a scope.  For this, leave an overlay if we encounter a
+       single open paren and return a semantic-list in the lexer.  When this
+       list gets expanded, retrieve the old position from the overlay.  See
+       the comments in the function for further details.
+       (semantic-lex-spp-find-closing-macro): New function to find the next
+       macro which closes scope (i.e., has a closing paren).
+       (semantic-lex-spp-replace-or-symbol-or-keyword): Go to end of closing
+       macro if necessary.
+       (semantic-lex-spp-paren-or-list): New lexer to specially deal with
+       parens in macro definitions.
+
+       * bovine/c.el (semantic-cpp-lexer): Use new
+       `semantic-lex-spp-paren-or-list'.
+
+       * tests/cedet/semantic/test/manual/cedet/testsppreplace.c:
+       * tests/cedet/semantic/test/manual/cedet/testsppreplaced.c: Add tests 
for the
+       above.
+
+2013-10-19 David Engster <address@hidden>
+
+       C/C++: Fix function pointer parsing
+
+       * semantic/bovine/c.by (variablearg-opt-name): Support parsing of
+       function pointers inside an argument list.
+
+       * semantic/bovine/c.el (semantic-c-reconstitute-token): Change
+       handling of function pointers; instead of seeing them as variables,
+       handle them as functions with a 'function-pointer' attribute.  Also,
+       correctly deal with function pointers as function arguments.
+       (semantic-c-reconstitute-function-arglist): New function to parse
+       function pointers inside an argument list.
+       (semantic-format-tag-name): Use 'function-pointer' attribute instead
+       of the old 'functionpointer-flag'.
+
+       * tests/cedet/semantic/test/manual/cedet/testsppreplace.c:
+       * tests/cedet/semantic/test/manual/cedet/testsppreplaced.c: Disable
+       test which now breaks due to improved function pointer parsing.
+       This test is broken anyway, since it just succeeded because the
+       argument list was not parsed at all before this commit.  The
+       underlying bug was always present in the semantic preprocessor.  ---
+       tests/cedet/semantic/test/manual/cedet/testsppreplace.c | 8 ++++++++
+       1 file changed, 8 insertions(+)
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2012-12-31 Eric Ludlam <address@hidden>
+
+       New test file.
+
+2013-03-31 Eric Ludlam <address@hidden>
+
+       New pretend system include for cpproot test.
+
+2008-08-23 zappo <address@hidden>
+
+       How to use the cit-test.sh script.
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2014-10-22 Eric Ludlam <address@hidden>
+
+       Added arduino and better suggestions
+
+       * test/manual/cedet/cedet/ede/secure-utest.el:
+       (ede-security-project-entries): Add arduino.
+       (ede-security-test-one-entry): Improve an error w/ suggestion on a
+       thing to fix.
+
+2014-10-21 Eric Ludlam <address@hidden>
+
+       Fixes for security tests
+
+       * test/manual/cedet/cedet/ede/secure-utest.el: (ede-security-entry):
+       Remove init-state, with[out]-permission
+       slots. (ede-security-project-entries): Add generic config based
+       projects. (ede-security-test-one-entry): Add long test for
+       configuration loading, and the security steps involved in making the
+       config load.
+
+2014-10-18 Eric Ludlam <address@hidden>
+
+       EDE security tests
+
+       Tests for the security system in EDE that marks some project types as
+       unsafe.  This makes sure that the user isn't pestered too much, and
+       that if they say yes or no the right thing happens.
+
+2014-04-20 Eric Ludlam <address@hidden>
+
+       Fake configure.in for project detection purposes.
+
+2015-01-31 David Engster <address@hidden>
+
+       eieio: Move to obsolete and use the one that ships with Emacs
+
+       * lisp/eieio: Move to obsolete.
+
+       * etc/fallback-libraries: Add eieio fallback libraries.
+
+       * Makefile (top-level): Remove eieio compilation and add compilation of
+       fallback eieio for Emacs 24.1 and 24.2. Throw error for Emacs 23.x.
+
+       * cedet-devel-load.el: Always require eieio at the top.  Load
+       cedet-compat earlier.  Remove advices for eieio helpers.
+
+       * cedet-remove-builtin.el: eieio must not be removed anymore.
+
+       * semantic/ede-grammar.el (semantic-ede-proj-target-grammar): Remove
+       cedet-compat from aux-packages initform, as it will be loaded by
+       cedet-devel-load anyway.
+       (ede-proj-makefile-insert-variables): Remove eieio from load-path.
+
+       * lisp/cedet/cedet-compat.el: Load fallback eieio for Emacs 24.1 and
+       24.2.  Add new aliases for Emacs 24.3.
+
+       * Project.ede, Makefiles: Remove eieio and regenerate.
+
+       * tests: Remove eieio tests.
+
+2014-01-01 Eric Ludlam <address@hidden>
+
+       (cit): Add "cit-projvar.el".
+
+2012-09-13 David Engster <address@hidden>
+
+       Move Speedbar development to Emacs trunk.
+
+       Moved Speedbar, dframe, sb-image and documentation to obsolete.
+       Development of Speedbar now happens solely in Emacs trunk.  This also
+       means that all other CEDET packages now depend on Speedbar from Emacs
+       proper.
+
+2012-03-12 Eric Ludlam <address@hidden>
+
+       (cit/Lisp): Add cit-projvar.el
+
+2012-02-24 Eric Ludlam <address@hidden>
+
+       (Lisp): Add cit-arduino
+
+2011-08-02 Eric Ludlam <address@hidden>
+
+       (Lisp): Add cit-android.el
+
+2010-06-13 zappo <address@hidden>
+
+       (Lisp): Add cit-externaldb.el
+
+2010-04-18 zappo <address@hidden>
+
+       (Lisp): Add cit-symref.el.
+
+2009-12-26 zappo <address@hidden>
+
+       ("cit"): Add cit-dist.el
+
+2009-10-16 zappo <address@hidden>
+
+       (Lisp): Use preload compiler.
+
+2009-05-30 zappo <address@hidden>
+
+       ("Lisp"): Added cogre as an aux package.
+
+2009-05-30 zappo <address@hidden>
+
+       (Lisp): Add cit-uml.el (Misc): Add cit-uml.cgr
+
+2009-03-01 zappo <address@hidden>
+
+       Merge from 1.0pre6 branch
+
+2009-02-24 zappo <address@hidden>
+
+       ("cit"): Add speedbar aux package.
+
+2009-01-28 zappo <address@hidden>
+
+       ("cit"): Give it a new name. (Misc): New target.
+
+2009-01-24 zappo <address@hidden>
+
+       ("Lisp"): Add :versionsource, and :aux-packages
+
+2008-09-04 zappo <address@hidden>
+
+       ("Lisp"): Add cit-gnustep.el
+
+2008-08-23 zappo <address@hidden>
+
+       ("ede-proj-project"): Add scripts/cit-test.sh
+
+2008-02-24 zappo <address@hidden>
+
+       (Lisp): Add cit-srec.el (templates): New
+
+2008-02-24 zappo <address@hidden>
+
+       ("Lisp"): Add cit-cpp, cit-el, cit-texi, cit-load
+
+2008-02-19 zappo <address@hidden>
+
+       New metaproject
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2014-04-20 Eric Ludlam <address@hidden>
+
+       Fake config.h for project detection purposes.
+
+2014-05-23 Eric Ludlam <address@hidden>
+
+       Test src file for a dirmatch.
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2011-05-15 xscript <address@hidden>
+
+       Synchronize cedet/semantic with Emacs.
+
+2014-01-01 Eric Ludlam <address@hidden>
+
+       Test files contributed by Barry OReilly
+
+       * test/manual/cedet/integ_src/globalref/test/ManagerTest.hh: These
+       test files contributed by Barry OReilly, modified for use in the
+       automated tests for CEDET, and with additional comments.
+       inc/Util.hh, src/Util.cc: Search symbol both in and outside of
+       namespaces.
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2013-07-28 David Engster <address@hidden>
+
+       Remove compatibility function `cedet-called-interactively-p'.
+
+       * lisp/cedet/cedet-compat.el (cedet-called-interactively-p): Remove.
+       It is no longer needed since our minimum version is now 23.2, which
+       has `called-interactively-p'.  Also, remove corresponding unit
+       tests.
+
+       * tests/cedet-utests.el (cedet-utest-test-alist): Remove cedet-compat
+       unit tests.
+
+       * All files: Replace `cedet-called-interactively-p' with
+       `called-interactively-p', providing 'any as argument where it was
+       still missing.
+
+2011-11-27 David Engster <address@hidden>
+
+       Fix interactive unit tests.
+
+       * pulse-utest.el (pulse-test): Use normal overlay functions.
+
+       * cedet-utests.el (chart): Require.
+
+2011-08-20 Eric Ludlam <address@hidden>
+
+       Add header comments and provide.
+
+2013-03-31 Eric Ludlam <address@hidden>
+
+       Don't check contents after initial fil
+
+       * test/manual/cedet/cit-texi.el: (cit-srecode-fill-texi): Do not check
+       contents after initial fill.  See comment for why.
+
+2010-09-15 xscript <address@hidden>
+
+       Remove obsolete cvs-auto-updated 'X-RCS' line.
+
+2008-02-24 zappo <address@hidden>
+
+       Texinfo support for cedet integration tests.
+
+2014-01-01 Eric Ludlam <address@hidden>
+
+       Test files contributed by Barry OReilly
+
+       * test/manual/cedet/integ_src/globalref/test/ManagerTest.cc: These
+       test files contributed by Barry OReilly, modified for use in the
+       automated tests for CEDET, and with additional comments.
+       inc/Util.hh, src/Util.cc: Search symbol both in and outside of
+       namespaces.
+
+2015-10-18 Eric Ludlam <address@hidden>
+
+       Tests for polymorphism
+
+       * test/manual/cedet/cedet/semantic/tests/testpoly.cpp
+       Tests for polymorphism with a couple examples where we could try to
+       disambiguate.
+
+2013-03-31 Eric Ludlam <address@hidden>
+
+       New include for cpproot test that is in a subdirectory.
+
+2013-11-04 David Engster <address@hidden>
+
+       Use random temporary directory for integration tests
+
+       * tests/cedet-integ-test.el (cedet-integ-base): Use `make-temp-name'
+       so that integrations tests can run in parallel.
+       (cedet-integ-test-proj): Delete it after usage.
+       (cit-check-compilation-for-error): Show compilation output in
+       batch-mode.
+       * tests/cit-test.sh: Do not remove temporary directory.
+
+2012-01-09 David Engster <address@hidden>
+
+       Accept any potential project directory during testing
+
+       * tests/cit-test.sh: Set `ede-project-directories' to t during
+       integration tests.
+
+2011-11-15 David Engster <address@hidden>
+
+       * tests/cit-test.sh: Fix filename for integration test.
+
+2011-11-07 David Engster <address@hidden>
+
+       * cedet-load.el: Load cogre autoloads.
+
+       * tests/cedet-integ-test.el: Remove gnustep require.
+
+       * tests/cit-android.el: Fix require.
+
+       * tests/cit-test.sh: Fix paths when calling integration test.
+
+2010-10-19 David Engster <address@hidden>
+
+       * cit-test.sh: Add support for running in batch mode.
+
+2009-08-08 zappo <address@hidden>
+
+       Reverse the exist status of Emacs.
+
+2009-08-08 zappo <address@hidden>
+
+       Determine the STYLE of test to run. If none passed in, use Make.
+
+2009-05-30 zappo <address@hidden>
+
+       Add -f toggle-debug-on-quit flag
+
+2009-02-24 zappo <address@hidden>
+
+       Patch from Marcus Harnisch
+
+       * test/manual/cedet/cit-test.sh: (EMACS): Use conditional value from
+       the environment.
+
+2008-08-28 safanaj <address@hidden>
+
+       Remove more temporary directories
+
+       * test/manual/cedet/cit-test.sh: remove more dirs because to test
+       ede-gnustep we need another dir, this is because `ede-new' check the
+       :class-sym that don't match in /tmp/CEDET_INTEG (that contain a
+       ede-proj-project).
+
+2008-03-23 zappo <address@hidden>
+
+       Run the tests.
+
+2014-01-01 Eric Ludlam <address@hidden>
+
+       Test files contributed by Barry OReilly
+
+       These test files contributed by Barry OReilly, modified for use in the
+       automated tests for CEDET, and with additional comments.  inc/Util.hh,
+       src/Util.cc: Search symbol both in and outside of namespaces.
+
+2015-04-07 Eric Ludlam <address@hidden>
+
+       Uniquafy names from last example from Martin to include ms_ prefix.
+
+2015-03-22 Eric Ludlam <address@hidden>
+
+       (ms_structs, fun): New test example from Marting Stein.
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2013-03-31 Eric Ludlam <address@hidden>
+
+       (cpprootsys.h, projincmacros.h): New includes (projmacro_a): New fcn.
+
+2012-12-31 Eric Ludlam <address@hidden>
+
+       New test file.
+
+2010-09-15 xscript <address@hidden>
+
+       Remove obsolete cvs-auto-updated 'X-RCS' line.
+
+2010-06-13 zappo <address@hidden>
+
+       (cit-symref-quick-find-test): New. (cit-symref-count): Add a small wait 
of .1.
+
+2010-04-18 zappo <address@hidden>
+
+       Semantic Symref testing.
+
+2014-01-01 Eric Ludlam <address@hidden>
+
+       Add test files
+
+       * test/manual/cedet/integ_src/globalref/src/Manager.cc: These test
+       files contributed by Barry OReilly, modified for use in the automated
+       tests for CEDET, and with additional comments.  inc/Util.hh,
+       src/Util.cc: Search symbol both in and outside of namespaces.
+
+2014-04-18 Eric Ludlam <address@hidden>
+
+       (func): Add local8 with a ternary conditional.
+
+2014-02-02 David Engster <address@hidden>
+
+       Fix typo in last commit.
+
+2014-02-02 David Engster <address@hidden>
+
+       Add test for parsing local variables
+
+       * tests/cedet/semantic/test/manual/cedet/testlocalvars.cpp: New file.
+       * tests/cedet/semantic/test/manual/cedet/Project.ede: Add above.
+       * tests/cedet/semantic/test/manual/cedet/Makefile: Regenerate.
+       * tests/cedet/semantic/ia-utest.el (semantic-ia-utest-file-list): Add
+       new test file.
+
+2011-04-26 xscript <address@hidden>
+
+       Synchronize base 'cedet/ede' with Emacs
+
+2013-03-27 Eric Ludlam <address@hidden>
+
+       Validate project overrides
+
+       * test/manual/cedet/cit-srec.el: (cit-srecode-map-test): Expand tests
+       to validate that project settings correctly override system level
+       templates.
+
+2010-09-15 xscript <address@hidden>
+
+       Remove obsolete cvs-auto-updated 'X-RCS' line.
+
+2008-02-24 zappo <address@hidden>
+
+       SRecoder feature testing.
+
+2010-09-15 xscript <address@hidden>
+
+       Fix paths to current code location.
+
+       * Makefile (CEDET_ELISP_PACKAGES, CEDET_VERSION, recompile)
+       (utest): Fix paths to current code location.
+
+       * cedet-build.el: Idem.
+
+       * tests/Makefile (LOADPATH): Idem.
+
+2010-06-13 zappo <address@hidden>
+
+       (Lisp_LISP): Add cit-externaldb.el
+
+2010-04-18 zappo <address@hidden>
+
+       (Lisp_LISP): Add cit-symref.el
+
+2009-12-26 zappo <address@hidden>
+
+       (Lisp_LISP): Add cit-dist.el
+
+2009-10-16 zappo <address@hidden>
+
+       (ELISPPRELOAD): New (Lisp): Use preloads.
+
+2009-05-30 zappo <address@hidden>
+
+       (LOADPATH): Add cogre to the load path.
+
+2009-05-30 zappo <address@hidden>
+
+       (Lisp_LISP): Add cit-uml.el (Misc_MISC): Add cit-uml.cgr
+
+2009-03-01 zappo <address@hidden>
+
+       Merge from 1.0pre6 branch
+
+2009-02-24 zappo <address@hidden>
+
+       (LOADPATH): Add speedbar. (EMACSFLAGS): New variable (Lisp): Use above.
+
+2009-01-28 zappo <address@hidden>
+
+       (LOADPATH): Add contrib. (Misc): New (dist): Add Misc
+
+2009-01-24 zappo <address@hidden>
+
+       (LOADPATH): Added
+
+2008-09-04 zappo <address@hidden>
+
+       (Lisp_LISP): Add cit-gnustep.el
+
+2008-08-23 zappo <address@hidden>
+
+       (all, dist): Add scripts (scripts): New
+
+2008-02-24 zappo <address@hidden>
+
+       (templates_MISC, tempaltes): New (all, dist): add templates
+
+2008-02-24 zappo <address@hidden>
+
+       (Lisp_LISP): Add cit-srec.el
+
+2008-02-24 zappo <address@hidden>
+
+       (Lisp_LISP): Add cit-cpp, cit-el, cit-texi, cit-load
+
+2008-02-19 zappo <address@hidden>
+
+       New Makefile.
+
+2014-11-26 Eric Ludlam <address@hidden>
+
+       Test friends
+
+       * test/manual/cedet/cedet/semantic/tests/testfriends.cpp:
+       (Af): Add a friend of C w/out the CLASS token. (C): New.  (scA, scB,
+       scC, scD): New test classes. (main): New (scA::PublicMethod,
+       scB::b_pub_method, scC::c_pub_method) (scD::d_pub_method): New.
+
+2011-04-29 xscript <address@hidden>
+
+       Move tests in cedet/semantic
+
+2014-04-20 Eric Ludlam <address@hidden>
+
+       Fake lisp.h for project detection purposes.
+
+2012-03-12 Eric Ludlam <address@hidden>
+
+       New test for project variables.
+
+2014-05-18 Eric Ludlam <address@hidden>
+
+       Test Makefile.am for subdir in project-am detector.
+
+2015-04-11 Eric Ludlam <address@hidden>
+
+       New test files combining macros and EDE
+
+2011-08-20 Eric Ludlam <address@hidden>
+
+       Add header comments and provide.
+
+2013-03-27 Eric Ludlam <address@hidden>
+
+       New template file testing the PROJECT variable setting.
+
+2014-05-31 Eric Ludlam <address@hidden>
+
+       Test project configuration file.
+
+2015-04-11 Eric Ludlam <address@hidden>
+
+       New test files combining macros and EDE
+
+2011-12-01 David Engster <address@hidden>
+
+       Fix unit testing for several tests and do better error checking.
+
+       * semantic/lex-spp-utests.el (semantic-lex-spp-write-utest):
+       * tests/cedet-utests.el (cedet-utest-eieio-classloader): Throw
+       error if we cannot locate test files.
+
+       * semantic/utest-c.el (semantic-utest-c-compare)
+       (semantic-utest-c-conditionals):
+       * semantic/lex-spp-utest.el (semantic-lex-spp-write-utest): Adapt
+       to new directory structure and do better error checking to avoid
+       silent failures in the future.
+
+2011-08-20 Eric Ludlam <address@hidden>
+
+       Add header comments and provide.
+
+2013-04-06 Eric Ludlam <address@hidden>
+
+       Disable saving EDE's cache file.
+
+2012-09-16 Eric Ludlam <address@hidden>
+
+       Don't init semantic mode at this point
+
+       * test/manual/cedet/cit-load.el: cedet-integ-test.el
+       (cit-srecode-fill-with-stuff): Stop initializing semantic-mode.
+
+       cit-load.el
+       Turn on semantic-mode.
+
+2012-01-16 Eric Ludlam <address@hidden>
+
+       Disable `ede-project-directories' checking during tests.
+
+2011-11-01 David Engster <address@hidden>
+
+       First changes to make them work.
+
+       * srecode/filters.el: Remove requires for `srecode/table' and
+       `srecode/insert'. Instead, declare variables and functions
+       explicitly.
+
+       * srecode/insert.el: Add require for `srecode/filters'.
+
+       * tests/cedet-integ-test.el: Fix require `ede/make'. Add
+       `srecode/find', remove cit/gnustep.
+       (cedet-integ-test-GNUStep): Removed for now.
+       (cit-srecode-fill-with-stuff): Activate `semantic-mode'.
+
+       * tests/cit-gnustep.el: Fix require.
+
+       * tests/cit-load.el: Remove Emacs22 compat.
+
+       * tests/cit-test.sh: Fix test call.
+
+2010-09-15 xscript <address@hidden>
+
+       Remove obsolete cvs-auto-updated 'X-RCS' line.
+
+2009-10-18 zappo <address@hidden>
+
+       (semantic-c): Hack for Emacs 21 to get things running.
+
+2009-03-14 zappo <address@hidden>
+
+       Disable semanticdb-file saving. Disable srecode map saving.
+
+2008-03-11 zappo <address@hidden>
+
+       (inhibit-splash-screen): Set this.
+
+2008-02-24 zappo <address@hidden>
+
+       (cit-src-dir): New var.
+
+2008-02-24 zappo <address@hidden>
+
+       Test system load file.
+
+2014-05-30 Eric Ludlam <address@hidden>
+
+       New test file.
+
 2015-04-06  Fabián Ezequiel Gallina  <address@hidden>
 
        * automated/python-tests.el (python-info-assignment-statement-p-1)
diff --git a/test/manual/cedet/Makefile b/test/manual/cedet/Makefile
deleted file mode 100644
index caff730..0000000
--- a/test/manual/cedet/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# Automatically Generated Makefile by EDE.
-# For use with: make
-#
-# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
-# EDE is the Emacs Development Environment.
-# http://cedet.sourceforge.net/ede.shtml
-#
-
-top=
-ede_FILES=Project.ede Makefile
-
-Lisp_LISP=cedet-integ-test.el cit-cpp.el cit-el.el cit-texi.el cit-load.el 
cit-srec.el cit-gnustep.el cit-uml.el cit-dist.el cit-symref.el 
cit-externaldb.el
-EMACS=emacs
-EMACSFLAGS=-batch --no-site-file
-LOADPATH= ../lisp/speedbar/ ../lisp/cogre/ ../lisp/contrib/ ../lisp/ede/ 
../lisp/srecode/ ../lisp/semantic/wisent/ ../lisp/semantic/bovine/ 
../lisp/semantic/ ../lisp/eieio/ ../lisp/common/
-ELISPPRELOAD= cedet-compat
-templates_MISC=cit-extra-cpp.srt
-scripts_MISC=cit-test.sh
-Misc_MISC=README ChangeLog cit-uml.cgr
-VERSION=1.0
-DISTDIR=$(top)cit-$(VERSION)
-
-
-
-all: Lisp templates scripts Misc
-
-.PHONY: Lisp
-Lisp: $(Lisp_LISP)
-       @echo "(add-to-list 'load-path nil)" > address@hidden
-       for loadpath in . ${LOADPATH}; do \
-          echo "(add-to-list 'load-path \"$$loadpath\")" >> address@hidden; \
-       done;
-       for preload in ${ELISPPRELOAD}; do \
-          echo "(load \"$$preload\")" >> address@hidden; \
-       done;
-       @echo "(setq debug-on-error t)" >> address@hidden
-       "$(EMACS)" $(EMACSFLAGS) -l address@hidden -f batch-byte-compile $^
-
-templates:
-       @
-
-scripts:
-       @
-
-Misc:
-       @
-
-tags:
-
-
-clean:
-       rm -f *.elc
-
-.PHONY: dist
-
-dist:
-       mkdir $(DISTDIR)
-       cp $(Lisp_LISP) $(templates_MISC) $(scripts_MISC) $(Misc_MISC) 
$(ede_FILES) $(DISTDIR)
-
-Makefile: Project.ede
-       @echo Makefile is out of date!  It needs to be regenerated by EDE.
-       @echo If you have not modified Project.ede, you can use 'touch' to 
update the Makefile time stamp.
-       @false
-
-
-
-# End of Makefile
diff --git a/test/manual/cedet/Project.ede b/test/manual/cedet/Project.ede
deleted file mode 100644
index 61459b6..0000000
--- a/test/manual/cedet/Project.ede
+++ /dev/null
@@ -1,28 +0,0 @@
-;; Object cit
-;; EDE Project Files are auto generated: Do Not Edit
-(ede-proj-project "cit"
-  :file "Project.ede"
-  :name "cit"
-  :targets
-  (list
-    (ede-proj-target-elisp "Lisp"
-      :name "Lisp"
-      :path ""
-      :source '("cedet-integ-test.el" "cit-cpp.el" "cit-el.el" "cit-texi.el" 
"cit-load.el" "cit-srec.el" "cit-gnustep.el" "cit-uml.el" "cit-dist.el" 
"cit-symref.el" "cit-externaldb.el" "cit-android.el" "cit-arduino.el" 
"cit-projvar.el" "cit-globalref.el")
-      :versionsource '("cedet-integ-test.el")
-      :compiler 'ede-emacs-preload-compiler
-      :aux-packages '("inversion" "semantic" "semantic-bovine" 
"semantic-wisent" "srecode" "ede" "ede-gnustep" "cogre")
-      :pre-load-packages '("cedet-compat"))
-    (ede-proj-target-makefile-miscelaneous "templates"
-      :name "templates"
-      :path ""
-      :source '("cit-extra-cpp.srt"))
-    (ede-proj-target-makefile-miscelaneous "scripts"
-      :name "scripts"
-      :path ""
-      :source '("cit-test.sh"))
-    (ede-proj-target-makefile-miscelaneous "Misc"
-      :name "Misc"
-      :path ""
-      :source '("README" "ChangeLog" "cit-uml.cgr")))
-  :metasubproject t)
diff --git a/test/manual/cedet/README b/test/manual/cedet/README
deleted file mode 100644
index 572e80d..0000000
--- a/test/manual/cedet/README
+++ /dev/null
@@ -1,12 +0,0 @@
- * HOW TO RUN CEDET INTEGRATION TESTS *
-   ==================================
-
-Run the shell script:
-
-  ./cit-test.sh
-
-Modify this script to specify the Emacs command to use to start Emacs.
-
-Once Emacs is up, do not move the mouse, or produce any other events
-for Emacs to read, or the sit-for commands that show the current
-output will stall, and you won't be able to see the current state.
diff --git a/test/manual/cedet/cedet-integ-test.el 
b/test/manual/cedet/cedet-integ-test.el
index d0a95d9..765fed6 100644
--- a/test/manual/cedet/cedet-integ-test.el
+++ b/test/manual/cedet/cedet-integ-test.el
@@ -1,16 +1,9 @@
 ;;; cedet-integ-test.el --- CEDET full integration tests.
 
-;; Copyright (C) 2008, 2009, 2010, 2011 Eric M. Ludlam
+;; Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Eric M. Ludlam
 
 ;; Author: Eric M. Ludlam <address@hidden>
 
-(eval-and-compile
-  ;; Other package depend on this value at compile time via inversion.
-
-  (defvar cit-version "1.0"
-    "Current version of Semantic.")
-
-  )
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
 ;; published by the Free Software Foundation; either version 2, or (at
@@ -69,49 +62,45 @@
 ;;    a Make sure the semanticdb cleans up the dead cache files.
 ;;    b Make sure EDE clears this project from it's project cache.
 ;;
-;; 5) Use COGRE to build sources with SRecode
-;;    a Create a COGRE graph.
-;;    b Generate C++ code from the graph.
-;;    c Compile the sources.
-;;
-;; 6) Symref
+;; 5) Symref
 ;;    a Attempt to use symref to create a results list.
 ;;    b open/close entries in symref
 ;;    c Use 'rename' command to rename and rebuild.
 ;;    d See if GNU Global is installed
 ;;    e repeat above.
 ;;
-;; 7) Create a distribution file.
+;; 6) Create a distribution file.
 ;;    a Call "make dist"
 ;;    b update the version number
 ;;    c make a new dist.  Verify version number.
 ;;    d In a fresh dir, unpack the dist.
 ;;    e Compile that dist.
-;; 8) Try out some external database tools
-;;    a Gnu Global
-;;    b Cscope
-;;    c Idutils
+;;
+;; 7) Try out some external database tools
+;;    a GNU Global
+;;    b CScope
+;;    c idutils
 
 (require 'semantic)
 (require 'ede)
 (require 'data-debug)
-(require 'ede-make)
-(require 'cogre)
+(require 'ede/make)
+(require 'srecode/find)
 
-(eval-and-compile
-  (defvar cedet-integ-base "/tmp/CEDET_INTEG"
-    "Root of multiple project integration tests.")
-  )
+(defvar cedet-integ-base
+  (expand-file-name (make-temp-name "CEDET_INTEG-") temporary-file-directory)
+  "Root of multiple project integration tests.")
 
+(require 'cit-checkenv)
 (require 'cit-cpp)
 (require 'cit-symref)
-(require 'cit-uml)
 (require 'cit-srec)
 (require 'cit-el)
 (require 'cit-texi)
+(require 'cit-projvar)
 (require 'cit-externaldb)
-(require 'cit-android)
-(require 'cit-gnustep)
+(require 'cit-cpproot)
+(require 'cit-globalref)
 (require 'cit-dist)
 
 (defvar cedet-integ-target (expand-file-name "edeproj" cedet-integ-base)
@@ -120,10 +109,12 @@
 ;;; Code:
 (defun cedet-integ-test-Make ()
   "Run the full CEDET integration test using a Make style project."
+  (cit-checkenv "Make")
   (cedet-integ-test-proj "Make"))
 
 (defun cedet-integ-test-Automake ()
   "Run the full CEDET integration test using a Automake style project."
+  (cit-checkenv "Automake")
   (let ((ede-pconf-create-file-query nil))
     (cedet-integ-test-proj "Automake")))
 
@@ -160,9 +151,6 @@ Optional argument MAKE-TYPE is the style of EDE project to 
test."
     ;;
     (cit-srecode-fill-cpp make-type)
 
-    ;; 5 a,b,c) UML code generation test
-    (cit-fill-uml make-type)
-
     ;; 1 e) remove files from a project
     (cit-remove-add-to-project-cpp)
 
@@ -170,68 +158,87 @@ Optional argument MAKE-TYPE is the style of EDE project 
to test."
     (when (string= make-type "Automake")  ;; Only works w/ Automake
       (cit-remove-and-do-shared-lib make-type))
 
-    ;; 6) Test symref/refactoring tools
+    ;; 5) Test symref/refactoring tools
     (cit-symref)
 
-    ;; 8 a) Try out gnu-global and other external databases.
+    ;; 7 a) Try out gnu-global and other external databases.
     (cit-externaldb-test)
 
-    ;; 2 e) srecode map manipulation
-    (cit-srecode-map-test)
-
     ;; Do some more with Emacs Lisp.
     (cit-srecode-fill-el make-type)
 
     ;; Do some texinfo documentation.
     (cit-srecode-fill-texi)
 
+    ;; Make sure this test has ended
+    (sleep-for 2)
+
+    ;; Test out EDE project local variables
+    (cit-proj-variables)
+
     ;; Create a distribution
     (find-file (expand-file-name "README" cedet-integ-target))
     (cit-make-dist)
 
+    ;; Delete the temporary directory
+    (delete-directory cedet-integ-base t)
     (cit-finish-message "PASSED" make-type)
     ))
 
-(defun cedet-integ-test-GNUStep ()
-  "Run the CEDET integration test using GNUStep style project."
+(defun cedet-integ-test-cpproot ()
+  "Run the CEDET integration test using the Android style project."
   (interactive)
 
-  ;; Do an EDE GNUstep-Make Project
-  (make-directory (concat cedet-integ-target "_ede_GSMake") t)
-  (find-file (expand-file-name "README" (concat cedet-integ-target 
"_ede_GSMake"))) ;; only to change dir
-  (let ((ede-auto-add-method 'always))
-    (cit-ede-step-test))
+  (cit-checkenv "cpp")
 
-  (cit-finish-message "PASSED" "GNUStep")
-  )
+  (let ((ede-auto-add-method 'never))
+    (global-ede-mode 1)
+    ;; Do an EDE cpproot project.
+    (cit-ede-cpproot-test)
 
-(defun cedet-integ-test-android ()
-  "Run the Cedet integration test using the android style project."
+    ;; 2 e) srecode map manipulation
+    ;; Note on this:  This test used to be in the test for Makefile or
+    ;; Automake projects, but it does not depend on that project
+    ;; type.  Moving it here so it is faster to get to.
+    (cit-srecode-map-test)
+
+    (cit-finish-message "PASSED" "cpproot")
+    ))
+
+(defun cedet-integ-test-globalref ()
+  "Run the tests using Global to find symbols.
+This test is about optimizing for minimal file loads."
   (interactive)
 
+  (cit-checkenv "globalref")
+
   (let ((ede-auto-add-method 'never))
     (global-ede-mode 1)
-    ;; Do an ede android project. use cedet-android.el for project fabrication.
-    (cit-ede-android-test)
+    ;; Do an EDE cpproot project.
+    (cit-globalref-test)
 
-    (cit-finish-message "Passed" "Android")
+    (cit-finish-message "PASSED" "globalrefs")
     ))
 
 (defun cit-finish-message (message style)
   "Display a MESSAGE that some test is now finished.
 Argument STYLE is the type of build done."
-  (let ((b (set-buffer (get-buffer-create "*PASSED*"))))
-    (erase-buffer)
-    (insert "\n\n  PASSED!\n\n  Make Style: ")
-    (insert (format "%S" style) "\n")
-    (insert "\n\nWaiting 5 seconds before exiting with positive exit 
status.\n")
-    (switch-to-buffer b)
-    ;; Now wait.
-    (sit-for 5)
-    ;; 1 means GOOD to the shell script, since any other emacs exit
-    ;; mechanism will be 0. (ie - click on the X in the corner.)
-    (kill-emacs 1)
-    ))
+  ;; Do a message in case we're in batch mode
+  (ede-global-list-sanity-check)
+  (message "PASSED! -- Make Style: %S" style)
+  (unless noninteractive
+    (let ((b (set-buffer (get-buffer-create "*PASSED*"))))
+      (erase-buffer)
+      (insert "\n\n  PASSED!\n\n  Make Style: ")
+      (insert (format "%S" style) "\n")
+      (insert "\n\nWaiting 5 seconds before exiting with positive exit 
status.\n")
+      (switch-to-buffer b)
+      ;; Now wait.
+      (sit-for 5)))
+  ;; 1 means GOOD to the shell script, since any other emacs exit
+  ;; mechanism will be 0. (ie - click on the X in the corner.)
+  (kill-emacs 1)
+  )
 
 (defun cit-make-dir (dir)
   "Make directory DIR if it doesn't exist."
@@ -244,13 +251,30 @@ Append FILENAME to the target directory."
   (expand-file-name filename cedet-integ-target))
 
 (defun cit-srecode-fill-with-stuff (filename tags &rest
-                                             empty-dict-entries)
-  "Fill up FILENAME with some TAGS.
+                                            empty-dict-entries)
+  "Fill up FILENAME with some TAGS, and check the results.
+Argument FILENAME is the file to fill up.
+Argument TAGS is the list of tags to insert into FILENAME.
+EMPTY-DICT-ENTRIES are dictionary entries for the EMPTY fill macro."
+  (let ((post-empty-tags (apply 'cit-srecode-fill-with-stuff-notest
+                               filename tags
+                               empty-dict-entries)))
+
+    ;; Make sure the tags we have are the same as the tags we tried
+    ;; to insert.
+    (cit-srecode-verify-tags (semantic-fetch-tags)
+                            tags
+                            post-empty-tags)
+    ))
+
+(defun cit-srecode-fill-with-stuff-notest (filename tags &rest
+                                                   empty-dict-entries)
+  "Fill up FILENAME with some TAGS.  Do not check the results.
 Argument FILENAME is the file to fill up.
 Argument TAGS is the list of tags to insert into FILENAME.
 EMPTY-DICT-ENTRIES are dictionary entries for the EMPTY fill macro."
   (let ((post-empty-tags nil)
-        )
+       )
 
     ;;
     ;; Fill up foo.h, header file with class in it.
@@ -258,8 +282,8 @@ EMPTY-DICT-ENTRIES are dictionary entries for the EMPTY 
fill macro."
     (find-file (cit-file filename))
     (srecode-load-tables-for-mode major-mode)
     (condition-case nil
-        ;; Protect against a font-lock bug.
-        (erase-buffer)
+       ;; Protect against a font-lock bug.
+       (erase-buffer)
       (error nil))
     (apply 'srecode-insert "file:empty" empty-dict-entries)
 
@@ -271,41 +295,40 @@ EMPTY-DICT-ENTRIES are dictionary entries for the EMPTY 
fill macro."
     (setq post-empty-tags (semantic-fetch-tags))
 
     (sit-for 0)
+
     ;;
     ;; Add in our tags
     ;;
-    (dolist (tag tags)
+    (cit-srecode-insert-taglist tags)
 
-      ;; 3 b) Srecode to make more sources
-      ;; 3 c) Test incremental parsers (by side-effect)
-      (let ((e (srecode-semantic-insert-tag tag))
-            (code (semantic-tag-get-attribute tag :code)))
+    post-empty-tags))
 
-        (when code (insert code))
+(defun cit-srecode-insert-taglist (tags)
+  "Insert the list of TAGS at point in buffer."
+  (dolist (tag tags)
 
-        (goto-char e)
-        (sit-for 0)
-        )
-      )
-
-    (save-buffer)
+    ;; 3 b) Srecode to make more sources
+    ;; 3 c) Test incremental parsers (by side-effect)
+    (let ((e (srecode-semantic-insert-tag tag))
+         (code (semantic-tag-get-attribute tag :code)))
 
-    ;; Make sure the tags we have are the same as the tags we tried
-    ;; to insert.
-    (cit-srecode-verify-tags (semantic-fetch-tags)
-                             tags
-                             post-empty-tags)
+      (when code (insert code))
 
+      (goto-char e)
+      (sit-for 0)
+      )
+    )
 
-    ))
+  (save-buffer)
+  )
 
 (defclass cit-tag-verify-error-debug ()
   ((actual :initarg :actual
-           :documentation
-           "The actual value found in the buffer.")
+          :documentation
+          "The actual value found in the buffer.")
    (expected :initarg :expected
-             :documentation
-             "The expected value found in the buffer.")
+            :documentation
+            "The expected value found in the buffer.")
    )
   "Debugging object for cit tag verifier.")
 
@@ -316,74 +339,79 @@ are found, but don't error if they are not their."
   (while actual
 
     (let ((T1 (car actual))
-          (T2 (car expected)))
+         (T2 (car expected)))
 
       (cond
        ((semantic-tag-similar-p T1 T2
-                                :Default-Value
-                                :Code
-                                :Documentation ;; Todo - Can We Get This 
Removed?
-                                )
+                               :default-value
+                               :code
+                               :documentation ;; TODO - can we get this 
removed?
+                               )
 
-        (let ((mem1 (semantic-tag-components T1))
-              (mem2 (semantic-tag-components T2)))
+       (let ((mem1 (semantic-tag-components T1))
+             (mem2 (semantic-tag-components T2)))
 
-          (when (and (or mem1 mem2)
-                     (semantic-tag-p (car mem1)))
-            (cit-srecode-verify-tags mem1 mem2))
+         (when (and (or mem1 mem2)
+                    (semantic-tag-p (car mem1)))
+           (cit-srecode-verify-tags mem1 mem2))
 
-          (setq expected (cdr expected)))
-        )
+         (setq expected (cdr expected)))
+       )
 
-       ;;it might be in a list of extra tags???
+       ;;it might be in a list of extra tags???
        ((semantic-tag-similar-p T1 (car extra) :default-value :members)
 
-        ;; Don't check members.  These should be simple cases for now.
-        (setq extra (cdr extra))
-        )
+       ;; Don't check members.  These should be simple cases for now.
+       (setq extra (cdr extra))
+       )
 
        (t ;; Not the same
-        (data-debug-new-buffer "*Test Failure*")
-        (data-debug-insert-thing
-         (cit-tag-verify-error-debug "Dbg" :actual T1 :expected T2)
-         ">" "")
-
-        (error "Tag %s does not match %s"
-               (semantic-format-tag-name T1)
-               (semantic-format-tag-name T2))
-        )
+       (data-debug-new-buffer "*Test Failure*")
+       (data-debug-insert-thing
+        (cit-tag-verify-error-debug "Dbg" :actual T1 :expected T2)
+        ">" "")
+
+       (error "Tag %s does not match %s"
+              (semantic-format-tag-name T1)
+              (semantic-format-tag-name T2))
+       )
        ))
 
     (setq actual (cdr actual))
-    ))
+    )
+  (when expected
+    (data-debug-new-buffer "*Test Failure*")
+    (data-debug-insert-thing expected ">" "")
+    (error "After scanning Actual tags, %d expected tags were still left!"
+          (length expected)))
+  )
 
 (defun cit-compile-and-wait (&optional ARGS)
   "Compile our current project, but wait for it to finish.
 Optional ARGS are additional arguments to add to the compile command,
 such as 'clean'."
   (let ((bufftokill (find-file (cit-file "Project.ede"))))
-    ;; 1 F) Create A Build File If Needed..
+    ;; 1 f) Create a build file if needed..
     (if (ede-proj-project-child-p (ede-current-project))
        (ede-proj-regenerate))
-    (ede-proj-regenerate)
     ;; 1 g) build the sources.
-    (if (not args)
+    (if (not ARGS)
        (cit-compile-and-wait-using-ede-command)
 
       ;; If args, use our own command.
-      (compile (concat ede-make-command (or args "")))
+      (compile (concat ede-make-command (or ARGS "")))
 
       (cit-wait-for-compilation)
       (cit-check-compilation-for-error))
 
-    ;; kill off tmp buffer.
+    ;; Kill off tmp buffer.
     (kill-buffer bufftokill)
     ))
 
 (defun cit-compile-and-wait-using-ede-command ()
-  "Compile our current project using ede commands, but wait for it to finish.
-optional arguments can't be used."
-  ;; 1 g) Build the sources.
+  "Compile our current project using EDE commands, but wait for it to finish.
+Optional arguments can't be used."
+  ;; 1 g) build the sources.
   (ede-compile-project)
 
   (cit-wait-for-compilation)
@@ -393,7 +421,7 @@ optional arguments can't be used."
 (defun cit-wait-for-compilation ()
   "Wait for a compilation to finish."
   (while compilation-in-progress
-    (accept-process-output)
+    (accept-process-output nil 1)
     ;; If sit for indicates that input is waiting, then
     ;; read and discard whatever it is that is going on.
     (when (not (sit-for 1))
@@ -407,20 +435,22 @@ If optional INVERSE is non-nil, then throw an error if the
 compilation succeeded."
   (save-excursion
     (set-buffer "*compilation*")
+    (when noninteractive
+      (message "%s" (buffer-string)))
     (goto-char (point-max))
 
     (if (re-search-backward "Compilation exited abnormally " nil t)
-        (when (not inverse)
-          (error "Compilation failed!"))
+       (when (not inverse)
+         (error "Compilation failed!"))
       (when inverse
-        (error "Compilation succeeded erroneously!"))
+       (error "Compilation succeeded erroneously!"))
       )))
 
 (defun cit-run-target (command)
   "Run the program (or whatever) that is associated w/ the current target.
 Use COMMAND to run the program."
   (let ((target ede-object)
-        (cnt 0))
+       (cnt 0))
     ;; Run the target.
     (project-run-target target command)
     ;; Did it produce errors or anything?
@@ -429,13 +459,13 @@ Use COMMAND to run the program."
       (goto-char (point-min))
       ;; Wait for prompt.
       (unwind-protect
-          (while (not (re-search-forward "MOOSE" nil t))
-            (setq cnt (1+ cnt))
-            (when (> cnt 10) (error "Program output not detected"))
-            (sit-for .1))
-        ;; Show program output
-        (sit-for .2)
-        )
+         (while (not (re-search-forward "MOOSE" nil t))
+           (setq cnt (1+ cnt))
+           (when (> cnt 10) (error "Program output not detected"))
+           (sit-for .3))
+       ;; Show program output
+       (sit-for .2)
+       )
       )))
 
 (provide 'cedet-integ-test)
diff --git a/test/manual/cedet/cedet-utests.el 
b/test/manual/cedet/cedet-utests.el
index 139c87d..80f4259 100644
--- a/test/manual/cedet/cedet-utests.el
+++ b/test/manual/cedet/cedet-utests.el
@@ -30,9 +30,7 @@
 (require 'inversion-utest)
 (require 'pulse-utest)
 (require 'cedet-files-utests)
-(require 'cedet-compat)
 (require 'cedet/ede/detect-utest)
-(require 'cedet/ede/compdb-utest)
 (require 'cedet/ede/secure-utest)
 (require 'cedet/semantic/lex-utest)
 (require 'cedet/semantic/lex-spp-utest)
@@ -47,9 +45,6 @@
 (require 'cedet/srecode/test)
 (require 'cedet/srecode/fields-utest)
 (require 'cedet/srecode/test-getset)
-(require 'cedet/cogre/utest)
-(require 'cedet/cogre/periodic-utest)
-(require 'cedet/cogre/convert-utest)
 (require 'chart)
 
 ;;; Code:
@@ -67,6 +62,14 @@
     ("ezimage associations" . ezimage-image-association-dump)
     ("ezimage images" . ezimage-image-dump)
 
+    ;; Workging interactive tests.
+    ("working: wait-for-keypress" .
+     (lambda ()
+       (if (cedet-utest-noninteractive)
+          (message " ** Skipping test in noninteractive mode.")
+        (working-wait-for-keypress))))
+    ;("working: sleep" . working-verify-sleep)
+
     ;; Pulse
     ("pulse interactive test" . (lambda () (pulse-test t)))
 
@@ -74,18 +77,6 @@
     ("cedet file conversion" . cedet-files-utest)
 
     ;;
-    ;; EIEIO
-    ;;
-    ("eieio" . cedet-utest-eieio-classloader)
-    ("eieio: browser" . eieio-browse)
-    ("eieio: custom" . (lambda ()
-                        (require 'eieio-custom)
-                        (customize-variable 'eieio-widget-test)))
-    ("eieio: chart" . (lambda ()
-                       (if (cedet-utest-noninteractive)
-                           (message " ** Skipping test in noninteractive 
mode.")
-                         (chart-test-it-all))))
-    ;;
     ;; EDE
     ;;
     ("ede: project detection tests" . ede-detect-utest) ;; NOTE: must be 
before other EDE tests.
@@ -100,6 +91,7 @@
     ("semantic: multi-lang parsing" . semantic-utest-main)
     ("semantic: C parser (ERT)" . semantic-c-parser-test-ert)
     ("semantic: C preprocessor" . semantic-utest-c)
+    ("semantic: format tests" . semantic-fmt-utest)
     ("semantic: analyzer tests" . semantic-ia-utest)
     ("semanticdb: data cache" . semantic-test-data-cache)
     ("semantic: throw-on-input" .
@@ -109,6 +101,7 @@
         (semantic-test-throw-on-input))))
 
     ("semantic: gcc: output parse test" . semantic-gcc-test-output-parser)
+    ("wisent calculator" . wisent-calc-utest)
     ;;
     ;; SRECODE
     ;;
@@ -122,7 +115,7 @@
 
 ;;;###autoload
 (defun cedet-utest (&optional exit-on-error)
-  "Run the CEDET unit tests.
+  "Run the CEDET unittests.
 EXIT-ON-ERROR causes the test suite to exit on an error, instead
 of just logging the error."
   (interactive)
@@ -152,7 +145,7 @@ of just logging the error."
       ;; Cleanup stray input and events that are in the way.
       ;; Not doing this causes sit-for to not refresh the screen.
       ;; Doing this causes the user to need to press keys more frequently.
-      (when (and (interactive-p) (input-pending-p))
+      (when (and (called-interactively-p 'any) (input-pending-p))
        (if (fboundp 'read-event)
            (read-event)
          (read-char)))
@@ -182,10 +175,10 @@ of just logging the error."
   (condition-case err
       (when (catch 'cedet-utest-exit-on-error
              ;; Get basic semantic features up.
-              ;; OLD (semantic-load-enable-minimum-features)
-              ;; NEW
-              (semantic-mode 1)
-              ;(global-semanticdb-minor-mode 1)
+             ;; OLD (semantic-load-enable-minimum-features)
+             ;; NEW
+             (semantic-mode 1)
+             ;(global-semanticdb-minor-mode 1)
              ;; Disables all caches related to semantic DB so all
              ;; tests run as if we have bootstrapped CEDET for the
              ;; first time.
@@ -196,8 +189,8 @@ of just logging the error."
              ;; and will be forced to bootstrap a new one.
              (setq srecode-map-save-file nil)
 
-              ;; Disable saving EDE's cache file.
-              (setq ede-project-placeholder-cache-file nil)
+             ;; Disable saving EDE's cache file.
+             (setq ede-project-placeholder-cache-file nil)
 
              ;; Run the tests
              (cedet-utest t)
diff --git a/test/manual/cedet/cedet/ede/detect-utest.el 
b/test/manual/cedet/cedet/ede/detect-utest.el
index d98eff1..91a855b 100644
--- a/test/manual/cedet/cedet/ede/detect-utest.el
+++ b/test/manual/cedet/cedet/ede/detect-utest.el
@@ -144,8 +144,6 @@ It is passed the root project found.")
                     :classp 'project-am-makefile-p)
    (ede-detect-entry "android sub" :file "src/android/AndroidManifest.xml"
                     :classp 'ede-android-project-p)
-   (ede-detect-entry "android" :file "src/android/src/test.java"
-                    :classp 'ede-android-project-p)
    (ede-detect-entry "emacs" :file "src/emacs/Makefile"
                     :classp 'ede-emacs-project-p)
    (ede-detect-entry "emacs sub" :file "src/emacs/src/emacs.c"
@@ -156,21 +154,9 @@ It is passed the root project found.")
                     :classp 'ede-linux-project-p)
    (ede-detect-entry "linux sub" :file "src/linux/scripts/ver_linux"
                     :classp 'ede-linux-project-p)
-   (ede-detect-entry "compdb" :file "src/compdb/detect/main.cpp"
-                    :classp 'ede-compdb-project-p)
-   (ede-detect-entry "compdb sub" :file "src/compdb/detect/includes/foo.h"
-                    :classp 'ede-compdb-project-p)
-   (ede-detect-entry "ninja" :file "src/compdb/detect-ninja/main.cpp"
-                    :classp 'ede-ninja-project-p)
-   (ede-detect-entry "ninja sub" :file "src/compdb/detect-ninja/includes/foo.h"
-                    :classp 'ede-ninja-project-p)
    ;; jvm-base based projects.
    (ede-detect-entry "ant" :file "src/jvm/ant/build.xml"
                     :classp 'ede-ant-project-p)
-   (ede-detect-entry "lein" :file "src/jvm/lein/project.clj"
-                    :classp 'ede-lein2-project-p)
-   (ede-detect-entry "maven" :file "src/jvm/maven/pom.xml"
-                    :classp 'ede-maven2-project-p)
    ;; Generic project types just key of Makefile, SCons, etc.
    (ede-detect-entry "generic make" :file "src/generic/gen_make/sub/test.cpp"
                     :classp 'ede-generic-makefile-project-p
@@ -193,12 +179,6 @@ It is passed the root project found.")
    (ede-detect-entry "cpp-root" :file "src/cpproot/README"
                     :classp 'ede-cpp-root-project-p
                     :dorescan nil)
-   (ede-detect-entry "java-root sub" :file "src/javaroot/com/test/Foo.Java"
-                    :classp 'ede-java-root-project-p
-                    :dorescan nil)
-   (ede-detect-entry "java-root" :file "src/javaroot/README"
-                    :classp 'ede-java-root-project-p
-                    :dorescan nil)
    )
   "List of testing entries that do not use `diretest' feature.")
 
@@ -253,11 +233,6 @@ It is passed the root project found.")
                      :file (expand-file-name "cpproot/README"
                                              (ede-detect-utest-basedir)))
 
-(ede-java-root-project "UTESTJAVA"
-                      :name "java root test"
-                      :file (expand-file-name "javaroot/README"
-                                              (ede-detect-utest-basedir)))
-
 ;;;###autoload
 (defun ede-detect-utest (&optional FLAG)
   "Test out the detection scheme for EDE.
diff --git a/test/manual/cedet/cedet/semantic/utest-parse.el 
b/test/manual/cedet/cedet/semantic/utest-parse.el
index aa52e5e..e52bfbb 100644
--- a/test/manual/cedet/cedet/semantic/utest-parse.el
+++ b/test/manual/cedet/cedet/semantic/utest-parse.el
@@ -53,9 +53,13 @@ struct mystruct1 {
   float slot13;
 };
 
-int var1;
+typedef mystruct1 td_name1, td_name2;
 
+extern static inline int var1;
+
+extern \"C\" {
 float funp1(char arg11, char arg12);
+}
 
 char fun2(int arg_21, int arg_22) /*1*/
 {
@@ -123,20 +127,32 @@ int calc_sv(int);
        (overlay 138 151 "sutest.c")))
       :type "struct")
      nil (overlay 88 154 "sutest.c"))
+    ("td_name2" type
+     (:typedef
+      ("mystruct1" type (:type "class") nil nil)
+      :type "typedef"))
+    ("td_name1" type
+     (:typedef
+      ("mystruct1" type (:type "class") nil nil)
+      :type "typedef"))
     ("var1" variable
-     (:type "int")
+     (:typemodifiers ("extern" "static" "inline")
+      :type "int")
      nil (overlay 156 165 "sutest.c"))
     ("funp1" function
-     (:prototype-flag t :arguments
-                     (("arg11" variable
-                       (:type "char")
-                       (reparse-symbol arg-sub-list)
-                       (overlay 179 190 "sutest.c"))
-                      ("arg12" variable
-                       (:type "char")
-                       (reparse-symbol arg-sub-list)
-                       (overlay 191 202 "sutest.c")))
-                     :type "float")
+     (:typemodifiers ("extern" "\"C\"")
+      :type "float"
+      :arguments
+      (("arg11" variable
+       (:type "char")
+       (reparse-symbol arg-sub-list)
+       (overlay 179 190 "sutest.c"))
+       ("arg12" variable
+       (:type "char")
+       (reparse-symbol arg-sub-list)
+       (overlay 191 202 "sutest.c")))
+      :prototype-flag t
+      )
      nil (overlay 167 203 "sutest.c"))
     ("fun2" function
      (:arguments
@@ -254,6 +270,32 @@ if x:
 x = 2
 y = 3
 r, s, t = 1, 2, '3'
+
+# Test string corner cases.  Note that triple-quoted strings used
+# to depend on font-lock to apply syntax properties to them.
+# Code in the Python lexer that depended on scan-sexps and the
+# like has been replaced with more manual methods to work around
+# this problem.
+def str_test_1():
+    '''This might trip up wisent-python-forward-string: \\''' '''
+
+def str_test_2():
+    ('''Internal apostrophe in PAREN_BLOCK doesn't end this
+    string literal.  If you're using forward-sexp to skip this
+    parenthetical expression, and syntax properties from
+    python-mode haven't been applied, you'll fail to recognize
+    the end of this triple-quoted string because this last
+    apostrophe makes an odd number of apostrophes: ' Now it would
+    look like you have an unterminated string literal starting at
+    the last of these three apostrophes:''')
+
+def str_test_3():
+    \"don't\" \"trip\" \"on\" \"adjacent\" \"strings\"
+
+# str_test_4 is only here to make sure that we're still correctly
+# finding tags after all the preceding tests.
+def str_test_4():
+    pass
 "
 
 
@@ -286,11 +328,9 @@ r, s, t = 1, 2, '3'
       :type "class")
      nil nil)
     ("DocString" type
-     (:members
-      (("\"\"\"Documentation string\"\"\"" code
-       nil (reparse-symbol indented_block_body) nil))
-      :type "class")
-     nil nil) ;; doc "Documentation string"
+     (:documentation "Documentation string"
+      :type          "class")
+     nil nil)
     ("MultipleInheritance" type
      (:superclasses ("Parent1" "Parent2")
       :members
@@ -302,15 +342,21 @@ r, s, t = 1, 2, '3'
       (("method" function
        (:arguments
         (("this" variable
-          nil (reparse-symbol function_parameters) nil)))
+          nil (reparse-symbol function_parameters) nil))
+        :parent
+        "dummy")
        (reparse-symbol indented_block_body) nil)
        ("method2" function
-       (:arguments
+       (:parent
+        "dummy"
+        :arguments
         (("self" variable
           nil (reparse-symbol function_parameters) nil)))
        (reparse-symbol indented_block_body) nil)
        ("method3" function
-       (:arguments
+       (:parent
+        "dummy"
+        :arguments
         (("self" variable
           nil (reparse-symbol function_parameters) nil)
          ("a" variable
@@ -400,7 +446,13 @@ r, s, t = 1, 2, '3'
     ("if"      code     nil nil nil)
     ("x"       variable nil nil nil)
     ("y"       variable nil nil nil)
-    ("r, s, t" code     nil nil nil) ;; TODO should be multiple variable tags
+    ("r, s, t" code nil nil nil) ;; TODO should be multiple variable tags
+
+    ;; String tests
+    ("str_test_1" function nil nil nil)
+    ("str_test_2" function nil nil nil)
+    ("str_test_3" function nil nil nil)
+    ("str_test_4" function nil nil nil)
     )
   "List of expected tag names for Python.")
 
@@ -533,16 +585,16 @@ t2:t1 #1
   "
  (define fun1 2)
 
- (define fun2 3  ;1
-              )
+ (define (fun2 n) 3 ) ;1
+
 ")
 
 (defvar semantic-utest-Scheme-name-contents
   '(("fun1" variable
      (:default-value ("2"))
      nil (overlay 3 18 "tst.scm"))
-    ("fun2" variable
-     (:default-value ("3"))
+    ("fun2" function
+     (:arguments ("n"))
      nil (overlay 21 55 "tst.scm")))
   )
 
@@ -808,7 +860,7 @@ INSERTME is the text to be inserted after the deletion."
 
 (defun semantic-utest-Makefile()
   (interactive)
-  (semantic-utest-generic "Makefile" (semantic-utest-fname "Makefile") 
semantic-utest-Makefile-buffer-contents  semantic-utest-Makefile-name-contents  
 '("fun2") "#1" "#deleted line")
+  (semantic-utest-generic "Makefile" (semantic-utest-fname "Makefile") 
semantic-utest-Makefile-buffer-contents  semantic-utest-Makefile-name-contents  
 '("t2") "#1" "#deleted line")
   )
 
 (defun semantic-utest-Scheme()
@@ -931,21 +983,25 @@ SKIPNAMES includes lists of possible child nodes that 
should be missing."
 (defun semantic-utest-taglists-equivalent-p (table names skipnames)
   "Compare TABLE and NAMES, where skipnames allow list1 to be different.
 SKIPNAMES is a list of names that should be skipped in the NAMES list."
-  (let ((SN skipnames))
-    (while SN
-      (setq names (remove (car SN) names))
-      (setq SN (cdr SN))))
-  (while (and names table)
-    (if (not (semantic-utest-equivalent-tag-p (car names)
-                                             (car table)
-                                             skipnames))
-       (error "Expected %s, found %s"
-              (semantic-format-tag-prototype (car names))
-              (semantic-format-tag-prototype (car table))))
-    (setq names (cdr names)
-         table (cdr table)))
-  (when names (error "Items forgotten: %S"
+  (while (or names table)
+    (if (member (semantic-tag-name (car names)) skipnames)
+       (setq names (cdr names)) ;; Skip that name from the list
+
+      (if (not (semantic-utest-equivalent-tag-p (car names)
+                                               (car table)
+                                               skipnames))
+         (progn
+           (message "In Buffer: %S" (current-buffer))
+           (message "Content:\n%S" (buffer-string))
+
+           (error "Expected %s, found %s"
+                  (semantic-format-tag-summarize (car names))
+                  (semantic-format-tag-summarize (car table))))
+       (setq names (cdr names)
+             table (cdr table)))))
+  (when names (error "Items forgotten: %S\nSkipnames: %S"
                     (mapcar 'semantic-tag-name names)
+                    skipnames
                     ))
   (when table (error "Items extra: %S"
                     (mapcar 'semantic-tag-name table)))
@@ -1023,7 +1079,7 @@ SKIPNAMES is a list of names to remove from NAME-CONTENTS"
 (defun semantic-utest-last-invalid (name-contents names-removed killme 
insertme)
   "Make the last fcn invalid."
   (semantic-utest-kill-indicator killme insertme)
-;  (semantic-utest-verify-names name-contents names-removed); verify its gone 
;new validator doesnt handle skipnames yet
+  (semantic-utest-verify-names name-contents names-removed); verify its gone 
;new validator doesnt handle skipnames yet
   (semantic-utest-unkill-indicator);put back killed stuff
   )
 
diff --git a/test/manual/cedet/cit-checkenv.el 
b/test/manual/cedet/cit-checkenv.el
index 8d48e39..47c3bad 100644
--- a/test/manual/cedet/cit-checkenv.el
+++ b/test/manual/cedet/cit-checkenv.el
@@ -29,7 +29,6 @@
 (require 'cedet-global)
 (require 'cedet-idutils)
 (require 'cedet-cscope)
-(require 'cedet-java)
 
 (defclass cit-checkenv-test (eieio-named)
   ((testgroup :initarg :testgroup
@@ -115,13 +114,6 @@ If :test is a string, then this is a version string to 
look for.")
    (cit-checkenv-test "cpp" :testgroup '("Make" "Automake" "cpp") :test "cpp")
    ;; Texinfo
    (cit-checkenv-test "texinfo" :testgroup '("Make" "Automake") :test 
"makeinfo")
-   ;; Java stuff
-   (cit-checkenv-test "java"
-                     :testgroup "Java"
-                     :test (lambda () (cedet-java-version-check t))
-                     :result t)
-   (cit-checkenv-test "jar" :testgroup "Java" :test "jar")
-   (cit-checkenv-test "javap" :testgroup "Java" :test "javap")
    ;; arduino
    (cit-checkenv-test "arduino" :testgroup "Arduino"
                      :test (lambda ()
@@ -133,11 +125,6 @@ If :test is a string, then this is a version string to 
look for.")
                              (require 'ede/arduino)
                              (stringp (ede-arduino-Arduino.mk)))
                      :result t)
-   ;; android
-   (cit-checkenv-test "android-sdk" :testgroup "Android"
-                     :test (lambda () (cedet-android-adb-version-check t))
-                     :result t)
-   (cit-checkenv-test "ant" :testgroup "Android" :test "ant") ;; may be moving 
off this soon.
     )
   "List of checks to perform to see if this system can run the tests.
 Each entry is a `cit-checkenv-test' object.  See the doc for that
diff --git a/test/manual/cedet/cit-cpp.el b/test/manual/cedet/cit-cpp.el
index c0ae360..2662078 100644
--- a/test/manual/cedet/cit-cpp.el
+++ b/test/manual/cedet/cit-cpp.el
@@ -185,8 +185,32 @@ MAKE-TYPE is the type of make process to use."
   (cit-run-target "./Prog")
   )
 
-(defun cit-remove-add-to-project-cpp (make-type)
-  "Remve bar.cpp from the current project.
+(defun cit-remove-add-to-project-cpp ()
+  "Remve foo.cpp from the current project.  Add in a new generated file."
+
+  (find-file (cit-file "src/foo.cpp"))
+  ;; Whack the file
+  (ede-remove-file t)
+  (kill-buffer (current-buffer))
+  (delete-file (cit-file "src/foo.cpp"))
+  (delete-file (cit-file "src/foo.o"))
+
+  ;; Make a new one
+  (cit-srecode-fill-with-stuff "src/bar.cpp" cit-src-cpp-tags)
+  (ede-add-file "Prog")
+
+  ;; 1 g) build the sources.
+  ;; Direct compile to test that make fails properly.
+  (compile ede-make-command)
+
+  (cit-wait-for-compilation)
+  (cit-check-compilation-for-error t) ;; That should have errored.
+
+  (cit-compile-and-wait)
+  )
+
+(defun cit-remove-and-do-shared-lib (make-type)
+  "Remove bar.cpp from the current project.
 Create a new shared lib with bar.cpp in it.
 Argument MAKE-TYPE is the type of make project to create."
   (find-file (cit-file "src/bar.cpp"))
@@ -207,13 +231,13 @@ Argument MAKE-TYPE is the type of make project to create."
     (oset mt :linker 'ede-g++-linker-libtool)
     )
 
+
   ;; 1 g) build the sources.
   ;; Direct compile to test that make fails properly.
   (compile ede-make-command)
 
-
   (cit-wait-for-compilation)
-  (cit-check-compilation-for-error t) ;; That should have errored.
+  (cit-check-compilation-for-error t) ;; that should have errored.
 
   (let ((p (ede-current-project)))
     (if (string= make-type "Automake")
@@ -221,43 +245,22 @@ Argument MAKE-TYPE is the type of make project to create."
       (oset p :variables '( ( "CPPFLAGS" . "-I../include") )))
     (ede-commit-project p)
     )
+
   ;; Flip back over to main, and add our new testlib.
-  (find-file (cit-file "src/main.cpp"))
-  (let ((mt ede-object))
+
+  (let* ((buffer (find-file (cit-file "src/main.cpp")))
+        (mt ede-object))
     (if (string= make-type "Automake")
        (progn
          (oset mt :ldflags '("-L../lib"))
          (oset mt :ldlibs '("testlib")))
       ;; FIX THIS
       (oset mt :ldflags '("../lib/bar.o"));;HACK for libtool!
-      ))
-  (cit-compile-and-wait)
-  )
-
-(defun cit-remove-and-do-shared-lib ()
-  "Remove bar.cpp from the current project.
-Create a new shared lib with bar.cpp in it."
-  (when (string= make-type "Automake")
+      )
+    (cit-compile-and-wait)
 
-    (find-file (cit-file "src/bar.cpp"))
-    ;; Whack the file
-    (ede-remove-file t)
-
-    ;; Create a new shared lib target, and add bar.cpp to it.
-    (ede-new-target "testlib" "sharedobject" "n")
-    (ede-add-file "testlib")
-
-    ;; 1 g) build the sources.
-    ;; Direct compile to test that make fails properly.
-    (compile ede-make-command)
-
-  (cit-wait-for-compilation)
-  (cit-check-compilation-for-error t) ;; that should have errored.
-
-  (cit-compile-and-wait)
-
-  ;; Use the local libs version also to make sure it works.
-  (pop-to-buffer "main.cpp")
+    ;; Use the local libs version also to make sure it works.
+    (pop-to-buffer buffer))
   (let ((mt ede-object))
     (if (string= make-type "Automake")
        (progn
@@ -268,7 +271,7 @@ Create a new shared lib with bar.cpp in it."
       (oset mt :ldflags '("../lib/bar.o"));;HACK for libtool!
       ))
   (cit-compile-and-wait)
-    )
+  )
 
 (provide 'cit-cpp)
 ;;; cit-cpp.el ends here
diff --git a/test/manual/cedet/cit-cpproot.el b/test/manual/cedet/cit-cpproot.el
index 30a7004..a199b80 100644
--- a/test/manual/cedet/cit-cpproot.el
+++ b/test/manual/cedet/cit-cpproot.el
@@ -65,10 +65,10 @@
    (semantic-tag-new-function
     "main" "int"
     (list (semantic-tag-new-variable "argc" "int")
-         (semantic-tag-new-variable "argv" "char"
-                                    nil
-                                    :pointer 1
-                                    :dereference 1)))
+          (semantic-tag-new-variable "argv" "char"
+                                     nil
+                                     :pointer 1
+                                     :dereference 1)))
    (semantic-tag-new-function "feature1" "int" nil)
    (semantic-tag-new-function "feature2" "int" nil)
    (semantic-tag-new-function "feature3" "int" nil)
@@ -79,9 +79,9 @@
 
 (defvar cit-cpproot-depfiles
   (list (expand-file-name "cpprootsys.h" cit-integ-cpproot-sys-srcdir)
-       (expand-file-name "sppmacros.h" cit-integ-target-cpproot)
-       (expand-file-name "projinc/projincmacros.h" cit-integ-target-cpproot)
-       (expand-file-name "test.h" cit-integ-target-cpproot))
+        (expand-file-name "sppmacros.h" cit-integ-target-cpproot)
+        (expand-file-name "projinc/projincmacros.h" cit-integ-target-cpproot)
+        (expand-file-name "test.h" cit-integ-target-cpproot))
   "List of expected path names to include files found in main.cpp")
 
 (defun cit-ede-cpproot-test ()
@@ -93,7 +93,7 @@
   ;; Copy source files into the cpproot directory
   (condition-case nil
       ;; Emacs 24.2
-       (copy-directory (file-name-as-directory cit-integ-cpproot-srcdir) 
cit-integ-target-cpproot t t t)
+      (copy-directory (file-name-as-directory cit-integ-cpproot-srcdir) 
cit-integ-target-cpproot t t t)
 
     ;; Emacs 23
     (error
@@ -106,7 +106,7 @@
    :system-include-path (list cit-integ-cpproot-sys-srcdir)
    :include-path '( "/projinc" )
    :spp-table '( ("FEATURE3" . "1")
-                ("RANDOM" . "random") )
+                 ("RANDOM" . "random") )
    ;; Note: projincmacros is in the include path and will be found there.
    :spp-files '( "sppmacros.h" "projincmacros.h"))
 
@@ -123,18 +123,18 @@
 
   ;; Test out the include paths by checking the discovered file names for the 
includes.
   (let ((itag (semantic-find-tags-included (current-buffer)))
-       (expected cit-cpproot-depfiles))
+        (expected cit-cpproot-depfiles))
     (while (and itag expected)
 
       (when (not (string= (car expected)
-                         (semantic-dependency-tag-file (car itag))))
-       (error "Tag: %s found at %s, expected %s"
-              (semantic-format-tag-name (car itag))
-              (semantic-dependency-tag-file (car itag))
-              (car expected)))
+                          (semantic-dependency-tag-file (car itag))))
+        (error "Tag: %s found at %s, expected %s"
+               (semantic-format-tag-name (car itag))
+               (semantic-dependency-tag-file (car itag))
+               (car expected)))
 
       (setq itag (cdr itag)
-           expected (cdr expected)))
+            expected (cdr expected)))
     (when (or itag expected)
       (error "Number of found include tags does not match number of expected 
tags.")))
   )
diff --git a/test/manual/cedet/cit-javaroot.el 
b/test/manual/cedet/cit-javaroot.el
deleted file mode 100644
index 4f9ea5f..0000000
--- a/test/manual/cedet/cit-javaroot.el
+++ /dev/null
@@ -1,153 +0,0 @@
-;;; cit-javaroot.el --- Integration tests for java root
-;;
-;; Copyright (C) 2013 Eric M. Ludlam
-;;
-;; Author: Eric M. Ludlam <address@hidden>
-;;
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation, either version 3 of the
-;; License, or (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see http://www.gnu.org/licenses/.
-
-;;; Commentary:
-;;
-;; Integration test for the ede/java-root project type.
-
-(require 'semantic/db-javap)
-
-;;; Code:
-(defvar cit-integ-target-javaroot
-  (expand-file-name "edeproj_ede_javaroot" cedet-integ-base)
-  "Root of the EDE project integration tests for the ede/java-root project.")
-
-(defvar cit-integ-javaroot-subdir "integ_src/javaroot/"
-  "Directory of files to copy into the tmp project dir.")
-
-(defvar cit-integ-javaroot-sys-subdir "integ_src/fauxsyslib/"
-  "Directory of files to copy into the tmp project dir.")
-
-(defvar cit-integ-javaroot-srcdir
-  (expand-file-name
-   cit-integ-javaroot-subdir
-   (file-name-directory (locate-library "cit-javaroot")))
-  "The source directory for the JAVA root sources.")
-
-(defvar cit-integ-javaroot-sys-subdir "integ_src/fauxsyslib/"
-  "Directory of files to copy into the tmp project dir.")
-
-(defvar cit-integ-javaroot-sys-srcdir
-  (expand-file-name
-   cit-integ-javaroot-sys-subdir
-   (file-name-directory (locate-library "cit-javaroot")))
-  "The source directory dor the JAVA root sources.")
-
-(defvar cit-src-javaroot-main-tags
-  (list
-   (semantic-tag-new-include "TestLib" nil)
-   (semantic-tag-new-include "test.TestTest" nil)
-   (semantic-tag-new-include "testproj.TestInJar" nil)
-   (semantic-tag-new-include "syslib.TestSysJar" nil)
-   (semantic-tag-new-include "java.io.InputStream" nil)
-
-   (semantic-tag-new-type
-    "TestMain" "class"
-    (list
-     (semantic-tag-new-function
-      "main" "void"
-      (list (semantic-tag-new-variable "args" "String" nil
-                                      :dereference 1))
-      :typemodifiers '("public" "static"))
-      )
-    nil ;; parents
-    :typemodifiers '("public"))
-   )
-  "List of tags we need to be able to to find in main.java")
-
-(defvar cit-javaroot-depfiles
-  (list
-   (list 'semanticdb-table (expand-file-name "TestLib.java" 
cit-integ-target-javaroot))
-   (list 'semanticdb-table (expand-file-name "test/TestTest.java" 
cit-integ-target-javaroot))
-   (list 'semanticdb-table-jar-file "testproj/TestInJar.class")
-   (list 'semanticdb-table-jar-file "syslib/TestSysJar.class")
-   (list 'semanticdb-table-jar-file "java/io/InputStream.class")
-   ;;(expand-file-name "TestLib.h" cit-integ-javaroot-sys-srcdir)
-   )
-  "List of expected path names to include files found in TestMain.java")
-
-(defun cit-ede-javaroot-test ()
-  "Test the ede-java-root project type."
-  ;; Create directory for the project
-  (cit-make-dir cit-integ-target-javaroot)
-
-  ;; Copy source files into the javaroot directory
-  (condition-case nil
-      ;; Emacs 24.2
-       (copy-directory (file-name-as-directory cit-integ-javaroot-srcdir) 
cit-integ-target-javaroot t t t)
-
-    ;; Emacs 23
-    (error
-     (copy-directory (file-name-as-directory cit-integ-javaroot-srcdir) 
cit-integ-target-javaroot t t)))
-
-  ;; Create the ede-java-root-project class directly.
-  (ede-java-root-project
-   "TESTJAVAROOT"
-   :file (expand-file-name "TestMain.java" cit-integ-target-javaroot)
-   :localclasspath '( "/projjar/TestProj.jar" )
-   :classpath (list (expand-file-name "TestSys.jar" 
cit-integ-javaroot-sys-srcdir))
-   )
-
-  ;; Load up main
-  (find-file (cit-file-javaroot "TestMain.java"))
-
-  ;; Did the parse work at all???
-  (when (not (semantic-fetch-tags))
-    (semantic-c-describe-environment)
-    (error "TestMain.java failed to parse."))
-
-  ;; Validate found tags based on project provided macros.
-  (cit-srecode-verify-tags (semantic-fetch-tags) cit-src-javaroot-main-tags)
-
-  ;; Test out the include paths by checking the discovered file names for the 
includes.
-  (let ((itag (semantic-find-tags-included (current-buffer)))
-       (expected cit-javaroot-depfiles))
-    (while (and itag expected)
-
-      (let* ((db (semanticdb-find-table-for-include (car itag)))
-            (fn (if db (if (slot-exists-p db 'filename)
-                           (oref db :filename)
-                         (semanticdb-full-filename db))
-                  "<no db>")))
-
-       (when (or (not (object-of-class-p db (nth 0 (car expected))))
-                 (not (string= fn (nth 1 (car expected)))))
-
-         (error "Tag: %s found in db %s fname %s, expected db %s fname %s"
-                (semantic-format-tag-name (car itag))
-                (if db (object-class db) "<no DB>")
-                fn
-                (nth 0 (car expected))
-                (nth 1 (car expected)))
-         ))
-
-      (setq itag (cdr itag)
-           expected (cdr expected)))
-    (when (or itag expected)
-      (error "Number of found include tags does not match number of expected 
tags.")))
-  )
-
-(defun cit-file-javaroot (filename)
-  "Return a testing filename.
-Append FILENAME to the target directory."
-  (expand-file-name filename cit-integ-target-javaroot))
-
-(provide 'cit-javaroot)
-
-;;; cit-javaroot.el ends here
diff --git a/test/manual/cedet/cit-test.sh b/test/manual/cedet/cit-test.sh
deleted file mode 100755
index 94419e5..0000000
--- a/test/manual/cedet/cit-test.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-EMACS=${EMACS:-emacs}
-
-STYLE=$1
-if [ -z $1 ]; then
-    STYLE=Make
-fi
-
-# Further Emacs options (like --batch)
-OPTIONS=$2
-
-rm -r /tmp/CEDET_INTEG*
-
-cd ..
-$EMACS $OPTIONS -q -l cedet-devel-load.el -l tests/cit-load.el -f 
toggle-debug-on-error  -f toggle-debug-on-quit -f cedet-integ-test-${STYLE}
-EXITCODE=$?
-
-if [ $EXITCODE -eq 0 ]; then
-    # Reverse the meaning of a 0 exit status, as the user had to quit Emacs.
-    exit 1
-elif [ $EXITCODE -eq 1 ]; then
-    # On success, the program kills emacs with 1 (to be different.)
-    exit 0
-else
-    # Otherwise, Emacs might have an error running in batch mode, and we 
return it.
-    exit $EXITCODE
-fi
diff --git a/test/manual/cedet/ede-tests.el b/test/manual/cedet/ede-tests.el
deleted file mode 100644
index fdad01c..0000000
--- a/test/manual/cedet/ede-tests.el
+++ /dev/null
@@ -1,87 +0,0 @@
-;;; ede-tests.el --- Some tests for the Emacs Development Environment
-
-;; Copyright (C) 2008-2017 Free Software Foundation, Inc.
-
-;; Author: Eric M. Ludlam <address@hidden>
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Extracted from ede-locate.el in the CEDET distribution.
-
-;;; Code:
-
-;;; From ede-locate:
-
-(require 'ede/locate)
-
-;;; TESTS
-;;
-;; Some testing routines.
-(defun ede-locate-test-locate (file)
-  "Test EDE Locate on FILE using LOCATE type.
-The search is done with the current EDE root."
-  (interactive "sFile: ")
-  (let ((loc (ede-locate-locate
-             "test"
-             :root (ede-project-root-directory
-                    (ede-toplevel)))))
-    (data-debug-new-buffer "*EDE Locate ADEBUG*")
-    (ede-locate-file-in-project loc file)
-    (data-debug-insert-object-slots loc "]"))
-  )
-
-(defun ede-locate-test-global (file)
-  "Test EDE Locate on FILE using GNU Global type.
-The search is done with the current EDE root."
-  (interactive "sFile: ")
-  (let ((loc (ede-locate-global
-             "test"
-             :root (ede-project-root-directory
-                    (ede-toplevel)))))
-    (data-debug-new-buffer "*EDE Locate ADEBUG*")
-    (ede-locate-file-in-project loc file)
-    (data-debug-insert-object-slots loc "]"))
-  )
-
-(defun ede-locate-test-idutils (file)
-  "Test EDE Locate on FILE using ID Utils type.
-The search is done with the current EDE root."
-  (interactive "sFile: ")
-  (let ((loc (ede-locate-idutils
-             "test"
-             :root (ede-project-root-directory
-                    (ede-toplevel)))))
-    (data-debug-new-buffer "*EDE Locate ADEBUG*")
-    (ede-locate-file-in-project loc file)
-    (data-debug-insert-object-slots loc "]"))
-  )
-
-(defun ede-locate-test-cscope (file)
-  "Test EDE Locate on FILE using CScope type.
-The search is done with the current EDE root."
-  (interactive "sFile: ")
-  (let ((loc (ede-locate-cscope
-             "test"
-             :root (ede-project-root-directory
-                    (ede-toplevel)))))
-    (data-debug-new-buffer "*EDE Locate ADEBUG*")
-    (ede-locate-file-in-project loc file)
-    (data-debug-insert-object-slots loc "]"))
-  )
-
-;;; ede-test.el ends here
diff --git a/test/manual/cedet/semantic-ia-utest.el 
b/test/manual/cedet/semantic-ia-utest.el
deleted file mode 100644
index cf89daf..0000000
--- a/test/manual/cedet/semantic-ia-utest.el
+++ /dev/null
@@ -1,528 +0,0 @@
-;;; semantic-ia-utest.el --- Analyzer unit tests
-
-;; Copyright (C) 2008-2017 Free Software Foundation, Inc.
-
-;; Author: Eric M. Ludlam <address@hidden>
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-;; Use marked-up files in the test directory and run the analyzer
-;; on them.  Make sure the answers are correct.
-;;
-;; Each file has cursor keys in them of the form:
-;;   // -#- ("ans1" "ans2" )
-;; where # is 1, 2, 3, etc, and some sort of answer list.
-
-;;; Code:
-(require 'semantic)
-(require 'semantic/analyze)
-(require 'semantic/analyze/refs)
-(require 'semantic/symref)
-(require 'semantic/symref/filter)
-
-(load-file "cedet-utests.el")
-
-(defvar semantic-ia-utest-file-list
-  '(
-    "tests/testdoublens.cpp"
-    "tests/testsubclass.cpp"
-    "tests/testtypedefs.cpp"
-    "tests/testfriends.cpp"
-    "tests/testnsp.cpp"
-    "tests/testsppcomplete.c"
-    "tests/testvarnames.c"
-    "tests/testjavacomp.java"
-    )
-  "List of files with analyzer completion test points.")
-
-(defvar semantic-ia-utest-error-log-list nil
-  "List of errors occurring during a run.")
-
-;;;###autoload
-(defun semantic-ia-utest (&optional arg)
-  "Run the semantic ia unit test against stored sources.
-Argument ARG specifies which set of tests to run.
- 1 - ia utests
- 2 - regs utests
- 3 - symrefs utests
- 4 - symref count utests"
-  (interactive "P")
-  (save-excursion
-
-    (let ((fl semantic-ia-utest-file-list)
-         (semantic-ia-utest-error-log-list nil)
-         )
-
-      (cedet-utest-log-setup "ANALYZER")
-
-      (set-buffer (semantic-find-file-noselect
-                  (or (locate-library "semantic-ia-utest.el")
-                      "semantic-ia-utest.el")))
-
-      (while fl
-
-       ;; Make sure we have the files we think we have.
-       (when (not (file-exists-p (car fl)))
-         (error "Cannot find unit test file: %s" (car fl)))
-
-       ;; Run the tests.
-       (let ((fb (find-buffer-visiting (car fl)))
-             (b (semantic-find-file-noselect (car fl) t)))
-
-         ;; Run the test on it.
-         (save-excursion
-           (set-buffer b)
-
-           ;; This line will also force the include, scope, and typecache.
-           (semantic-clear-toplevel-cache)
-           ;; Force tags to be parsed.
-           (semantic-fetch-tags)
-
-           (semantic-ia-utest-log "  ** Starting tests in %s"
-                                  (buffer-name))
-
-           (when (or (not arg) (= arg 1))
-             (semantic-ia-utest-buffer))
-
-           (when (or (not arg) (= arg 2))
-             (set-buffer b)
-             (semantic-ia-utest-buffer-refs))
-
-           (when (or (not arg) (= arg 3))
-             (set-buffer b)
-             (semantic-sr-utest-buffer-refs))
-
-           (when (or (not arg) (= arg 4))
-             (set-buffer b)
-             (semantic-src-utest-buffer-refs))
-
-           (semantic-ia-utest-log "  ** Completed tests in %s\n"
-                                  (buffer-name))
-           )
-
-         ;; If it wasn't already in memory, whack it.
-         (when (not fb)
-           (kill-buffer b))
-         )
-       (setq fl (cdr fl)))
-
-      (cedet-utest-log-shutdown
-       "ANALYZER"
-       (when semantic-ia-utest-error-log-list
-        (format "%s Failures found."
-                (length semantic-ia-utest-error-log-list))))
-      (when semantic-ia-utest-error-log-list
-       (error "Failures found during analyzer unit tests"))
-      ))
-  )
-
-(defun semantic-ia-utest-buffer ()
-  "Run analyzer completion unit-test pass in the current buffer."
-
-  (let* ((idx 1)
-        (regex-p nil)
-        (regex-a nil)
-        (p nil)
-        (a nil)
-        (pass nil)
-        (fail nil)
-        (actual nil)
-        (desired nil)
-        ;; Exclude unpredictable system files in the
-        ;; header include list.
-        (semanticdb-find-default-throttle
-         (remq 'system semanticdb-find-default-throttle))
-        )
-    ;; Keep looking for test points until we run out.
-    (while (save-excursion
-            (setq regex-p (concat "//\\s-*-" (number-to-string idx) "-" )
-                  regex-a (concat "//\\s-*#" (number-to-string idx) "#" ))
-            (goto-char (point-min))
-            (save-match-data
-              (when (re-search-forward regex-p nil t)
-                (setq p (match-beginning 0))))
-            (save-match-data
-              (when (re-search-forward regex-a nil t)
-                (setq a (match-end 0))))
-            (and p a))
-
-      (save-excursion
-
-       (goto-char p)
-
-       (let* ((ctxt (semantic-analyze-current-context))
-              (acomp
-               (condition-case nil
-                   (semantic-analyze-possible-completions ctxt)
-                 (error nil))))
-         (setq actual (mapcar 'semantic-tag-name acomp)))
-
-       (goto-char a)
-
-       (let ((bss (buffer-substring-no-properties (point) (point-at-eol))))
-         (condition-case nil
-             (setq desired (read bss))
-           (error (setq desired (format "  FAILED TO PARSE: %S"
-                                        bss)))))
-
-       (if (equal actual desired)
-           (setq pass (cons idx pass))
-         (setq fail (cons idx fail))
-         (semantic-ia-utest-log
-          "    Failed %d.  Desired: %S Actual %S"
-          idx desired actual)
-         (add-to-list 'semantic-ia-utest-error-log-list
-                      (list (buffer-name) idx desired actual)
-                      )
-
-         )
-       )
-
-      (setq p nil a nil)
-      (setq idx (1+ idx)))
-
-    (if fail
-       (progn
-         (semantic-ia-utest-log
-          "    Unit tests (completions) failed tests %S"
-          (reverse fail))
-         )
-      (semantic-ia-utest-log "    Unit tests (completions) passed (%d total)"
-                            (- idx 1)))
-
-    ))
-
-(defun semantic-ia-utest-buffer-refs ()
-  "Run an analyze-refs unit-test pass in the current buffer."
-
-  (let* ((idx 1)
-        (regex-p nil)
-        (p nil)
-        (pass nil)
-        (fail nil)
-        ;; Exclude unpredictable system files in the
-        ;; header include list.
-        (semanticdb-find-default-throttle
-         (remq 'system semanticdb-find-default-throttle))
-        )
-    ;; Keep looking for test points until we run out.
-    (while (save-excursion
-            (setq regex-p (concat "//\\s-*\\^" (number-to-string idx) "^" )
-                  )
-            (goto-char (point-min))
-            (save-match-data
-              (when (re-search-forward regex-p nil t)
-                (setq p (match-beginning 0))))
-            p)
-
-      (save-excursion
-
-       (goto-char p)
-       (forward-char -1)
-
-       (let* ((ct (semantic-current-tag))
-              (refs (semantic-analyze-tag-references ct))
-              (impl (semantic-analyze-refs-impl refs t))
-              (proto (semantic-analyze-refs-proto refs t))
-              (pf nil)
-              )
-         (setq
-          pf
-          (catch 'failed
-            (if (and impl proto (car impl) (car proto))
-                (let (ct2 ref2 impl2 proto2
-                          newstart)
-                  (cond
-                   ((semantic-equivalent-tag-p (car impl) ct)
-                    ;; We are on an IMPL.  Go To the proto, and find matches.
-                    (semantic-go-to-tag (car proto))
-                    (setq newstart (car proto))
-                    )
-                   ((semantic-equivalent-tag-p (car proto) ct)
-                    ;; We are on a PROTO.  Go to the imple, and find matches
-                    (semantic-go-to-tag (car impl))
-                    (setq newstart (car impl))
-                    )
-                   (t
-                    ;; No matches is a fail.
-                    (throw 'failed t)
-                    ))
-                  ;; Get the new tag, does it match?
-                  (setq ct2 (semantic-current-tag))
-
-                  ;; Does it match?
-                  (when (not (semantic-equivalent-tag-p ct2 newstart))
-                    (throw 'failed t))
-
-                  ;; Can we double-jump?
-                  (setq ref2 (semantic-analyze-tag-references ct)
-                        impl2 (semantic-analyze-refs-impl ref2 t)
-                        proto2 (semantic-analyze-refs-proto ref2 t))
-
-                  (when (or (not (and impl2 proto2))
-                            (not
-                             (and (semantic-equivalent-tag-p
-                                   (car impl) (car impl2))
-                                  (semantic-equivalent-tag-p
-                                   (car proto) (car proto2)))))
-                    (throw 'failed t))
-                  )
-
-              ;; Else, no matches at all, so another fail.
-              (throw 'failed t)
-              )))
-
-          (if (not pf)
-             ;; We passed
-             (setq pass (cons idx pass))
-           ;; We failed.
-           (setq fail (cons idx fail))
-           (semantic-ia-utest-log
-            "    Failed %d.  For %s (Num impls %d) (Num protos %d)"
-            idx (if ct (semantic-tag-name ct) "<No tag found>")
-            (length impl) (length proto))
-           (add-to-list 'semantic-ia-utest-error-log-list
-                        (list (buffer-name) idx)
-                        )
-           ))
-
-       (setq p nil)
-       (setq idx (1+ idx))
-
-       ))
-
-    (if fail
-       (progn
-         (semantic-ia-utest-log
-          "    Unit tests (refs) failed tests")
-         )
-      (semantic-ia-utest-log "    Unit tests (refs) passed (%d total)"
-                            (- idx 1)))
-
-    ))
-
-(defun semantic-sr-utest-buffer-refs ()
-  "Run a symref unit-test pass in the current buffer."
-
-  ;; This line will also force the include, scope, and typecache.
-  (semantic-clear-toplevel-cache)
-  ;; Force tags to be parsed.
-  (semantic-fetch-tags)
-
-  (let* ((idx 1)
-        (tag nil)
-        (regex-p nil)
-        (desired nil)
-        (actual-result nil)
-        (actual nil)
-        (pass nil)
-        (fail nil)
-        (symref-tool-used nil)
-        ;; Exclude unpredictable system files in the
-        ;; header include list.
-        (semanticdb-find-default-throttle
-         (remq 'system semanticdb-find-default-throttle))
-        )
-    ;; Keep looking for test points until we run out.
-    (while (save-excursion
-            (setq regex-p (concat "//\\s-*\\%" (number-to-string idx) "%" )
-                  )
-            (goto-char (point-min))
-            (save-match-data
-              (when (re-search-forward regex-p nil t)
-                (setq tag (semantic-current-tag))
-                (goto-char (match-end 0))
-                (setq desired (read (buffer-substring (point) (point-at-eol))))
-                ))
-            tag)
-
-      (setq actual-result (semantic-symref-find-references-by-name
-                          (semantic-tag-name tag) 'target
-                          'symref-tool-used))
-
-      (if (not actual-result)
-         (progn
-           (setq fail (cons idx fail))
-           (semantic-ia-utest-log
-            "  Failed FNames %d: No results." idx)
-           (semantic-ia-utest-log
-            "  Failed Tool: %s" (object-name symref-tool-used))
-
-           (add-to-list 'semantic-ia-utest-error-log-list
-                        (list (buffer-name) idx)
-                        )
-           )
-
-       (setq actual (list (sort (mapcar
-                                 'file-name-nondirectory
-                                 (semantic-symref-result-get-files 
actual-result))
-                                'string<)
-                          (sort
-                           (mapcar
-                            'semantic-format-tag-canonical-name
-                            (semantic-symref-result-get-tags actual-result))
-                           'string<)))
-
-
-       (if (equal desired actual)
-           ;; We passed
-           (setq pass (cons idx pass))
-         ;; We failed.
-         (setq fail (cons idx fail))
-         (when (not (equal (car actual) (car desired)))
-           (semantic-ia-utest-log
-            "  Failed FNames %d: Actual: %S Desired: %S"
-            idx (car actual) (car desired))
-           (semantic-ia-utest-log
-            "  Failed Tool: %s" (object-name symref-tool-used))
-           )
-         (when (not (equal (car (cdr actual)) (car (cdr desired))))
-           (semantic-ia-utest-log
-            "  Failed TNames %d: Actual: %S Desired: %S"
-            idx (car (cdr actual)) (car (cdr desired)))
-           (semantic-ia-utest-log
-            "  Failed Tool: %s" (object-name symref-tool-used))
-           )
-         (add-to-list 'semantic-ia-utest-error-log-list
-                      (list (buffer-name) idx)
-                      )
-         ))
-
-      (setq idx (1+ idx))
-      (setq tag nil))
-
-    (if fail
-       (progn
-         (semantic-ia-utest-log
-          "    Unit tests (symrefs) failed tests")
-         )
-      (semantic-ia-utest-log "    Unit tests (symrefs) passed (%d total)"
-                            (- idx 1)))
-
-    ))
-
-(defun semantic-symref-test-count-hits-in-tag ()
-  "Lookup in the current tag the symbol under point.
-Then count all the other references to the same symbol within the
-tag that contains point, and return that."
-  (interactive)
-  (let* ((ctxt (semantic-analyze-current-context))
-        (target (car (reverse (oref ctxt prefix))))
-        (tag (semantic-current-tag))
-        (start (current-time))
-        (Lcount 0))
-    (when (semantic-tag-p target)
-      (semantic-symref-hits-in-region
-       target (lambda (start end prefix) (setq Lcount (1+ Lcount)))
-       (semantic-tag-start tag)
-       (semantic-tag-end tag))
-      (when (interactive-p)
-       (message "Found %d occurrences of %s in %.2f seconds"
-                Lcount (semantic-tag-name target)
-                (semantic-elapsed-time start (current-time))))
-      Lcount)))
-
-(defun semantic-src-utest-buffer-refs ()
-  "Run a sym-ref counting unit-test pass in the current buffer."
-
-  ;; This line will also force the include, scope, and typecache.
-  (semantic-clear-toplevel-cache)
-  ;; Force tags to be parsed.
-  (semantic-fetch-tags)
-
-  (let* ((idx 1)
-        (start nil)
-        (regex-p nil)
-        (desired nil)
-        (actual nil)
-        (pass nil)
-        (fail nil)
-        ;; Exclude unpredictable system files in the
-        ;; header include list.
-        (semanticdb-find-default-throttle
-         (remq 'system semanticdb-find-default-throttle))
-        )
-    ;; Keep looking for test points until we run out.
-    (while (save-excursion
-            (setq regex-p (concat "//\\s-*@"
-                                  (number-to-string idx)
-                                  "@\\s-+\\(\\w+\\)" ))
-            (goto-char (point-min))
-            (save-match-data
-              (when (re-search-forward regex-p nil t)
-                (goto-char (match-beginning 1))
-                (setq desired (read (buffer-substring (point) (point-at-eol))))
-                (setq start (match-beginning 0))
-                (goto-char start)
-                (setq actual (semantic-symref-test-count-hits-in-tag))
-                start)))
-
-      (if (not actual)
-         (progn
-           (setq fail (cons idx fail))
-           (semantic-ia-utest-log
-            "  Failed symref count %d: No results." idx)
-
-           (add-to-list 'semantic-ia-utest-error-log-list
-                        (list (buffer-name) idx)
-                        )
-           )
-
-       (if (equal desired actual)
-           ;; We passed
-           (setq pass (cons idx pass))
-         ;; We failed.
-         (setq fail (cons idx fail))
-         (when (not (equal actual desired))
-           (semantic-ia-utest-log
-            "  Failed symref count %d: Actual: %S Desired: %S"
-            idx actual desired)
-           )
-
-         (add-to-list 'semantic-ia-utest-error-log-list
-                      (list (buffer-name) idx)
-                      )
-         ))
-
-      (setq idx (1+ idx))
-      )
-
-    (if fail
-       (progn
-         (semantic-ia-utest-log
-          "    Unit tests (symrefs counter) failed tests")
-         )
-      (semantic-ia-utest-log "    Unit tests (symrefs counter) passed (%d 
total)"
-                            (- idx 1)))
-
-    ))
-
-(defun semantic-ia-utest-start-log ()
-  "Start up a testlog for a run."
-  ;; Redo w/ CEDET utest framework.
-  (cedet-utest-log-start "semantic: analyzer tests"))
-
-(defun semantic-ia-utest-log (&rest args)
-  "Log some test results.
-Pass ARGS to format to create the log message."
-  ;; Forward to CEDET utest framework.
-  (apply 'cedet-utest-log args))
-
-(provide 'semantic-ia-utest)
-
-;;; semantic-ia-utest.el ends here
diff --git a/test/manual/cedet/semantic-tests.el 
b/test/manual/cedet/semantic-tests.el
deleted file mode 100644
index bfcba7e..0000000
--- a/test/manual/cedet/semantic-tests.el
+++ /dev/null
@@ -1,389 +0,0 @@
-;;; semantic-utest.el --- Miscellaneous Semantic tests.
-
-;;; Copyright (C) 2003-2004, 2007-2017 Free Software Foundation, Inc.
-
-;; Author: Eric M. Ludlam <address@hidden>
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Originally, there are many test functions scattered among the
-;; Semantic source files.  This file consolidates them.
-
-(require 'data-debug)
-
-;;; From semantic-complete
-
-(require 'semantic/complete)
-
-(defun semantic-complete-test ()
-  "Test completion mechanisms."
-  (interactive)
-  (message "%S"
-   (semantic-format-tag-prototype
-    (semantic-complete-read-tag-project "Symbol: "))))
-
-;;; From semanticdb-ebrowse
-
-(require 'semantic/db-ebrowse)
-
-(defun semanticdb-ebrowse-run-tests ()
-  "Run some tests of the semanticdb-ebrowse system.
-All systems are different.  Ask questions along the way."
-  (interactive)
-  (let ((doload nil))
-    (when (y-or-n-p "Create a system database to test with? ")
-      (call-interactively 'semanticdb-create-ebrowse-database)
-      (setq doload t))
-    ;;  Should we load in caches
-    (when (if doload
-             (y-or-n-p "New database created.  Reload system databases? ")
-           (y-or-n-p "Load in all system databases? "))
-      (semanticdb-load-ebrowse-caches)))
-  ;; Ok, databases were created.  Let's try some searching.
-  (when (not (or (eq major-mode 'c-mode)
-                (eq major-mode 'c++-mode)))
-    (error "Please make your default buffer be a C or C++ file, then
-run the test again")))
-
-(defun semanticdb-ebrowse-dump ()
-  "Find the first loaded ebrowse table, and dump out the contents."
-  (interactive)
-  (let ((db semanticdb-database-list)
-       (ab nil))
-    (while db
-      (when (semanticdb-project-database-ebrowse-p (car db))
-       (setq ab (data-debug-new-buffer "*EBROWSE Database*"))
-       (data-debug-insert-thing (car db) "*" "")
-       (setq db nil)
-       )
-      (setq db (cdr db)))))
-
-;;; From semanticdb-global:
-
-(require 'semantic/db-global)
-
-(defvar semanticdb-test-gnu-global-startfile 
"~/src/global-5.7.3/global/global.c"
-  "File to use for testing.")
-
-(defun semanticdb-test-gnu-global (searchfor &optional standardfile)
-  "Test the GNU Global semanticdb.
-Argument SEARCHFOR is the text to search for.
-If optional arg STANDARDFILE is non-nil, use a standard file w/ global 
enabled."
-  (interactive "sSearch For Tag: \nP")
-
-  (require 'data-debug)
-  (save-excursion
-    (when standardfile
-      (save-match-data
-       (set-buffer (find-file-noselect semanticdb-test-gnu-global-startfile))))
-
-    (condition-case err
-       (semanticdb-enable-gnu-global-in-buffer)
-      (error (if standardfile
-                (error err)
-              (save-match-data
-                (set-buffer (find-file-noselect 
semanticdb-test-gnu-global-startfile)))
-              (semanticdb-enable-gnu-global-in-buffer))))
-
-    (let* ((db (semanticdb-project-database-global "global"))
-          (tab (semanticdb-file-table db (buffer-file-name)))
-          (result (semanticdb-deep-find-tags-for-completion-method tab 
searchfor))
-          )
-      (data-debug-new-buffer "*SemanticDB Gnu Global Result*")
-      (data-debug-insert-thing result "?" ""))))
-
-;;; From semantic-format
-
-(require 'semantic/format)
-
-(defun semantic-test-all-format-tag-functions (&optional arg)
-  "Test all outputs from `semantic-format-tag-functions'.
-Output is generated from the function under `point'.
-Optional argument ARG specifies not to use color."
-  (interactive "P")
-  (semantic-fetch-tags)
-  (let* ((tag (semantic-current-tag))
-        (par (semantic-current-tag-parent))
-        (fns semantic-format-tag-functions))
-    (with-output-to-temp-buffer "*format-tag*"
-      (princ "Tag->format function tests:")
-      (while fns
-       (princ "\n")
-       (princ (car fns))
-       (princ ":\n ")
-       (let ((s (funcall (car fns) tag par (not arg))))
-         (save-excursion
-           (set-buffer "*format-tag*")
-           (goto-char (point-max))
-           (insert s)))
-       (setq fns (cdr fns))))
-      ))
-
-;;; From semantic-fw:
-
-(require 'semantic/fw)
-
-(defun semantic-test-data-cache ()
-  "Test the data cache."
-  (interactive)
-  (let ((data '(a b c)))
-    (save-excursion
-      (set-buffer (get-buffer-create " *semantic-test-data-cache*"))
-      (erase-buffer)
-      (insert "The Moose is Loose")
-      (goto-char (point-min))
-      (semantic-cache-data-to-buffer (current-buffer) (point) (+ (point) 5)
-                                    data 'moose 'exit-cache-zone)
-      (if (equal (semantic-get-cache-data 'moose) data)
-         (message "Successfully retrieved cached data.")
-       (error "Failed to retrieve cached data")))))
-
-(defun semantic-test-throw-on-input ()
-  "Test that throw on input will work."
-  (interactive)
-  (semantic-throw-on-input 'done-die)
-  (message "Exit Code: %s"
-          (semantic-exit-on-input 'testing
-            (let ((inhibit-quit nil)
-                  (message-log-max nil))
-              (while t
-                (message "Looping ... press a key to test")
-                (semantic-throw-on-input 'test-inner-loop))
-              'exit)))
-  (when (input-pending-p)
-    (if (fboundp 'read-event)
-       (read-event)
-      (read-char))))
-
-;;; From semantic-idle:
-
-(require 'semantic/idle)
-
-(defun semantic-idle-pnf-test ()
-  "Test `semantic-idle-scheduler-work-parse-neighboring-files' and time it."
-  (interactive)
-  (let ((start (current-time))
-       (junk (semantic-idle-scheduler-work-parse-neighboring-files))
-       (end (current-time)))
-    (message "Work took %.2f seconds." (semantic-elapsed-time start end))))
-
-;;; From semantic-lex:
-
-(require 'semantic/lex)
-
-(defun semantic-lex-test-full-depth (arg)
-  "Test the semantic lexer in the current buffer parsing through lists.
-Usually the lexer parses.
-If universal argument ARG, then try the whole buffer."
-  (interactive "P")
-  (let* ((start (current-time))
-        (result (semantic-lex
-                 (if arg (point-min) (point))
-                 (point-max)
-                 100))
-        (end (current-time)))
-    (message "Elapsed Time: %.2f seconds."
-            (semantic-elapsed-time start end))
-    (pop-to-buffer "*Lexer Output*")
-    (require 'pp)
-    (erase-buffer)
-    (insert (pp-to-string result))
-    (goto-char (point-min))))
-
-(defun semantic-lex-test-region (beg end)
-  "Test the semantic lexer in the current buffer.
-Analyze the area between BEG and END."
-  (interactive "r")
-  (let ((result (semantic-lex beg end)))
-    (pop-to-buffer "*Lexer Output*")
-    (require 'pp)
-    (erase-buffer)
-    (insert (pp-to-string result))
-    (goto-char (point-min))))
-
-;;; From semantic-lex-spp:
-
-(require 'semantic/lex-spp)
-
-(defun semantic-lex-spp-write-test ()
-  "Test the semantic tag writer against the current buffer."
-  (interactive)
-  (with-output-to-temp-buffer "*SPP Write Test*"
-    (semantic-lex-spp-table-write-slot-value
-     (semantic-lex-spp-save-table))))
-
-(defun semantic-lex-spp-write-utest ()
-  "Unit test using the test spp file to test the slot write fcn."
-  (interactive)
-  (let* ((sem (locate-library "semantic-lex-spp.el"))
-        (dir (file-name-directory sem)))
-    (save-excursion
-      (set-buffer (find-file-noselect
-                  (expand-file-name "tests/testsppreplace.c"
-                                    dir)))
-      (semantic-lex-spp-write-test))))
-
-;;; From semantic-tag-write:
-
-;;; TESTING.
-
-(require 'semantic/tag-write)
-
-(defun semantic-tag-write-test ()
-  "Test the semantic tag writer against the tag under point."
-  (interactive)
-  (with-output-to-temp-buffer "*Tag Write Test*"
-    (semantic-tag-write-one-tag (semantic-current-tag))))
-
-(defun semantic-tag-write-list-test ()
-  "Test the semantic tag writer against the tag under point."
-  (interactive)
-  (with-output-to-temp-buffer "*Tag Write Test*"
-    (semantic-tag-write-tag-list (semantic-fetch-tags))))
-
-;;; From semantic-symref-filter:
-
-(require 'semantic/symref/filter)
-
-(defun semantic-symref-test-count-hits-in-tag ()
-  "Lookup in the current tag the symbol under point.
-Then count all the other references to the same symbol within the
-tag that contains point, and return that."
-  (interactive)
-  (let* ((ctxt (semantic-analyze-current-context))
-        (target (car (reverse (oref ctxt prefix))))
-        (tag (semantic-current-tag))
-        (start (current-time))
-        (Lcount 0))
-    (when (semantic-tag-p target)
-      (semantic-symref-hits-in-region
-       target (lambda (start end prefix) (setq Lcount (1+ Lcount)))
-       (semantic-tag-start tag)
-       (semantic-tag-end tag))
-      (when (interactive-p)
-       (message "Found %d occurrences of %s in %.2f seconds"
-                Lcount (semantic-tag-name target)
-                (semantic-elapsed-time start (current-time))))
-      Lcount)))
-
-;;; From bovine-gcc:
-
-(require 'semantic/bovine/gcc)
-
-;; Example output of "gcc -v"
-(defvar semantic-gcc-test-strings
-  '(;; My old box:
-    "Reading specs from /usr/lib/gcc-lib/i386-redhat-linux/3.2.2/specs
-Configured with: ../configure --prefix=/usr --mandir=/usr/share/man 
--infodir=/usr/share/info --enable-shared --enable-threads=posix 
--disable-checking --with-system-zlib --enable-__cxa_atexit 
--host=i386-redhat-linux
-Thread model: posix
-gcc version 3.2.2 20030222 (Red Hat Linux 3.2.2-5)"
-    ;; Alex Ott:
-    "Using built-in specs.
-Target: i486-linux-gnu
-Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.3.1-9ubuntu1' 
--with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs 
--enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared 
--with-system-zlib --libexecdir=/usr/lib --without-included-gettext 
--enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 
--program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug 
--enable-objc-gc --enable-mpfr --enable-targets=all --enable-chec [...]
-Thread model: posix
-gcc version 4.3.1 (Ubuntu 4.3.1-9ubuntu1)"
-    ;; My debian box:
-    "Using built-in specs.
-Target: x86_64-unknown-linux-gnu
-Configured with: ../../../sources/gcc/configure 
--prefix=/usr/local/glibc-2.3.6/x86_64/apps/gcc-4.2.3 
--with-gmp=/usr/local/gcc/gmp --with-mpfr=/usr/local/gcc/mpfr 
--enable-languages=c,c++,fortran 
--with-as=/usr/local/glibc-2.3.6/x86_64/apps/gcc-4.2.3/bin/as 
--with-ld=/usr/local/glibc-2.3.6/x86_64/apps/gcc-4.2.3/bin/ld --disable-multilib
-Thread model: posix
-gcc version 4.2.3"
-    ;; My mac:
-    "Using built-in specs.
-Target: i686-apple-darwin8
-Configured with: /private/var/tmp/gcc/gcc-5341.obj~1/src/configure 
--disable-checking -enable-werror --prefix=/usr --mandir=/share/man 
--enable-languages=c,objc,c++,obj-c++ 
--program-transform-name=/^[cg][^.-]*$/s/$/-4.0/ 
--with-gxx-include-dir=/include/c++/4.0.0 --with-slibdir=/usr/lib 
--build=powerpc-apple-darwin8 --with-arch=pentium-m --with-tune=prescott 
--program-prefix= --host=i686-apple-darwin8 --target=i686-apple-darwin8
-Thread model: posix
-gcc version 4.0.1 (Apple Computer, Inc. build 5341)"
-    ;; Ubuntu Intrepid
-    "Using built-in specs.
-Target: x86_64-linux-gnu
-Configured with: ../src/configure -v --with-pkgversion='Ubuntu 
4.3.2-1ubuntu12' --with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs 
--enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared 
--with-system-zlib --libexecdir=/usr/lib --without-included-gettext 
--enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 
--program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug 
--enable-objc-gc --enable-mpfr --enable-checking=release --build [...]
-Thread model: posix
-gcc version 4.3.2 (Ubuntu 4.3.2-1ubuntu12)"
-    ;; Red Hat EL4
-    "Reading specs from /usr/lib/gcc/x86_64-redhat-linux/3.4.6/specs
-Configured with: ../configure --prefix=/usr --mandir=/usr/share/man 
--infodir=/usr/share/info --enable-shared --enable-threads=posix 
--disable-checking --with-system-zlib --enable-__cxa_atexit 
--disable-libunwind-exceptions --enable-java-awt=gtk --host=x86_64-redhat-linux
-Thread model: posix
-gcc version 3.4.6 20060404 (Red Hat 3.4.6-10)"
-    ;; Red Hat EL5
-    "Using built-in specs.
-Target: x86_64-redhat-linux
-Configured with: ../configure --prefix=/usr --mandir=/usr/share/man 
--infodir=/usr/share/info --enable-shared --enable-threads=posix 
--enable-checking=release --with-system-zlib --enable-__cxa_atexit 
--disable-libunwind-exceptions --enable-libgcj-multifile 
--enable-languages=c,c++,objc,obj-c++,java,fortran,ada --enable-java-awt=gtk 
--disable-dssi --enable-plugin 
--with-java-home=/usr/lib/jvm/java-1.4.2-gcj-1.4.2.0/jre --with-cpu=generic 
--host=x86_64-redhat-linux
-Thread model: posix
-gcc version 4.1.2 20080704 (Red Hat 4.1.2-44)"
-    ;; David Engster's german gcc on ubuntu 4.3
-    "Es werden eingebaute Spezifikationen verwendet.
-Ziel: i486-linux-gnu
-Konfiguriert mit: ../src/configure -v --with-pkgversion='Ubuntu 
4.3.2-1ubuntu12' --with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs 
--enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared 
--with-system-zlib --libexecdir=/usr/lib --without-included-gettext 
--enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 
--program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug 
--enable-objc-gc --enable-mpfr --enable-targets=all --enable-ch [...]
-Thread-Modell: posix
-gcc-Version 4.3.2 (Ubuntu 4.3.2-1ubuntu12)"
-    ;; Damien Deville bsd
-    "Using built-in specs.
-Target: i386-undermydesk-freebsd
-Configured with: FreeBSD/i386 system compiler
-Thread model: posix
-gcc version 4.2.1 20070719  [FreeBSD]"
-    )
-  "A bunch of sample gcc -v outputs from different machines.")
-
-(defvar semantic-gcc-test-strings-fail
-  '(;; A really old solaris box I found
-    "Reading specs from 
/usr/local/gcc-2.95.2/lib/gcc-lib/sparc-sun-solaris2.6/2.95.2/specs
-gcc version 2.95.2 19991024 (release)"
-    )
-  "A bunch of sample gcc -v outputs that fail to provide the info we want.")
-
-(defun semantic-gcc-test-output-parser ()
-  "Test the output parser against some collected strings."
-  (interactive)
-  (let ((fail nil))
-    (dolist (S semantic-gcc-test-strings)
-      (let* ((fields (semantic-gcc-fields S))
-             (v (cdr (assoc 'version fields)))
-             (h (or (cdr (assoc 'target fields))
-                    (cdr (assoc '--target fields))
-                    (cdr (assoc '--host fields))))
-             (p (cdr (assoc '--prefix fields)))
-             )
-       ;; No longer test for prefixes.
-        (when (not (and v h))
-          (let ((strs (split-string S "\n")))
-            (message "Test failed on %S\nV H P:\n%S %S %S" (car strs) v h p))
-          (setq fail t))
-        ))
-    (dolist (S semantic-gcc-test-strings-fail)
-      (let* ((fields (semantic-gcc-fields S))
-             (v (cdr (assoc 'version fields)))
-             (h (or (cdr (assoc '--host fields))
-                    (cdr (assoc 'target fields))))
-             (p (cdr (assoc '--prefix fields)))
-             )
-        (when (and v h p)
-          (message "Negative test failed on %S" S)
-          (setq fail t))
-        ))
-    (if (not fail) (message "Tests passed."))
-    ))
-
-(defun semantic-gcc-test-output-parser-this-machine ()
-  "Test the output parser against the machine currently running Emacs."
-  (interactive)
-  (let ((semantic-gcc-test-strings (list (semantic-gcc-query "gcc" "-v"))))
-    (semantic-gcc-test-output-parser))
-  )
diff --git a/test/manual/cedet/semantic-utest-c.el 
b/test/manual/cedet/semantic-utest-c.el
deleted file mode 100644
index 26ce400..0000000
--- a/test/manual/cedet/semantic-utest-c.el
+++ /dev/null
@@ -1,72 +0,0 @@
-;;; semantic-utest-c.el --- C based parsing tests.
-
-;; Copyright (C) 2008-2017 Free Software Foundation, Inc.
-
-;; Author: Eric M. Ludlam <address@hidden>
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-;; Run some C based parsing tests.
-
-(require 'semantic)
-
-(defvar semantic-utest-c-comparisons
-  '( ("testsppreplace.c" . "testsppreplaced.c")
-     )
-  "List of files to parse and compare against each other.")
-
-;;; Code:
-;;;###autoload
-(defun semantic-utest-c ()
-  "Run parsing test for C from the test directory."
-  (interactive)
-  (dolist (fp semantic-utest-c-comparisons)
-    (let* ((sem (locate-library "semantic"))
-          (sdir (file-name-directory sem))
-          (semantic-lex-c-nested-namespace-ignore-second nil)
-          (tags-actual
-           (save-excursion
-             (set-buffer (find-file-noselect (expand-file-name (concat 
"tests/" (car fp)) sdir)))
-             (semantic-clear-toplevel-cache)
-             (semantic-fetch-tags)))
-          (tags-expected
-           (save-excursion
-             (set-buffer (find-file-noselect (expand-file-name (concat 
"tests/" (cdr fp)) sdir)))
-             (semantic-clear-toplevel-cache)
-             (semantic-fetch-tags))))
-      ;; Now that we have the tags, compare them for SPP accuracy.
-      (dolist (tag tags-actual)
-       (if (and (semantic-tag-of-class-p tag 'variable)
-                (semantic-tag-variable-constant-p tag))
-           nil                         ; skip the macros.
-         (if (semantic-tag-similar-with-subtags-p tag (car tags-expected))
-             (setq tags-expected (cdr tags-expected))
-           (with-mode-local c-mode
-             (error "Found: >> %s << Expected: >>  %s <<"
-                    (semantic-format-tag-prototype tag nil t)
-                    (semantic-format-tag-prototype (car tags-expected) nil t)
-                    )))
-         ))
-      ;; Passed?
-      (message "PASSED!")
-      )))
-
-
-(provide 'semantic-utest-c)
-
-;;; semantic-utest-c.el ends here
diff --git a/test/manual/cedet/semantic-utest.el 
b/test/manual/cedet/semantic-utest.el
deleted file mode 100644
index f735e55..0000000
--- a/test/manual/cedet/semantic-utest.el
+++ /dev/null
@@ -1,867 +0,0 @@
-;;; semantic-utest.el --- Tests for semantic's parsing system.
-
-;;; Copyright (C) 2003-2004, 2007-2017 Free Software Foundation, Inc.
-
-;; Author: Eric M. Ludlam <address@hidden>
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-;; Semantic's parsing and partial parsing system is pretty complex.
-;; These unit tests attempt to emulate semantic's partial reparsing
-;; and full reparsing system, and anything else I may feel the urge
-;; to write a test for.
-
-(require 'semantic)
-
-(load-file "cedet-utests.el")
-
-(defvar semantic-utest-temp-directory (if (fboundp 'temp-directory)
-                                         (temp-directory)
-                                       temporary-file-directory)
-  "Temporary directory to use when creating files.")
-
-(defun semantic-utest-fname (name)
-  "Create a filename for NAME in /tmp."
-  (expand-file-name name semantic-utest-temp-directory))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Data for C tests
-
-(defvar semantic-utest-C-buffer-contents
-  "/* Test file for C language for Unit Tests */
-
-#include <stdio.h>
-#include \"sutest.h\"
-
-struct mystruct1 {
-  int slot11;
-  char slot12;
-  float slot13;
-};
-
-int var1;
-
-float funp1(char arg11, char arg12);
-
-char fun2(int arg_21, int arg_22) /*1*/
-{
-  struct mystruct1 *ms1 = malloc(sizeof(struct mystruct1));
-
-  char sv = calc_sv(var1);
-
-  if (var1 == 0) {
-     sv = 1;
-  } else if (arg_21 == 0) {
-     sv = 2;
-  } else if (arg_22 == 0) {
-     sv = 3;
-  } else {
-     sv = 4;
-  }
-
-  printf(\"SV = %d\\n\", sv);
-
-  /* Memory Leak */
-  ms1.slot1 = sv;
-
-  return 'A' + sv;
-}
-"
-  "Contents of a C buffer initialized by this unit test.
-Be sure to change `semantic-utest-C-name-contents' when you
-change this variable.")
-
-(defvar semantic-utest-C-h-buffer-contents
-  "/* Test file for C language header file for Unit Tests */
-
-int calc_sv(int);
-
-"
-  "Contents of a C header file buffer initialized by this unit test.")
-
-(defvar semantic-utest-C-filename (semantic-utest-fname "sutest.c")
-  "File to open and erase during this test for C.")
-
-(defvar semantic-utest-C-filename-h
-  (concat (file-name-sans-extension semantic-utest-C-filename)
-         ".h")
-  "Header file filename for C")
-
-
-(defvar semantic-utest-C-name-contents
-  '(("stdio.h" include
-     (:system-flag t)
-     nil (overlay 48 66 "sutest.c"))
-    ("sutest.h" include nil nil (overlay 67 86 "sutest.c"))
-    ("mystruct1" type
-     (:members
-      (("slot11" variable
-       (:type "int")
-       (reparse-symbol classsubparts)
-       (overlay 109 120 "sutest.c"))
-       ("slot12" variable
-       (:type "char")
-       (reparse-symbol classsubparts)
-       (overlay 123 135 "sutest.c"))
-       ("slot13" variable
-       (:type "float")
-       (reparse-symbol classsubparts)
-       (overlay 138 151 "sutest.c")))
-      :type "struct")
-     nil (overlay 88 154 "sutest.c"))
-    ("var1" variable
-     (:type "int")
-     nil (overlay 156 165 "sutest.c"))
-    ("funp1" function
-     (:prototype-flag t :arguments
-                     (("arg11" variable
-                       (:type "char")
-                       (reparse-symbol arg-sub-list)
-                       (overlay 179 190 "sutest.c"))
-                      ("arg12" variable
-                       (:type "char")
-                       (reparse-symbol arg-sub-list)
-                       (overlay 191 202 "sutest.c")))
-                     :type "float")
-     nil (overlay 167 203 "sutest.c"))
-    ("fun2" function
-     (:arguments
-      (("arg_21" variable
-       (:type "int")
-       (reparse-symbol arg-sub-list)
-       (overlay 215 226 "sutest.c"))
-       ("arg_22" variable
-       (:type "int")
-       (reparse-symbol arg-sub-list)
-       (overlay 227 238 "sutest.c")))
-      :type "char")
-     nil (overlay 205 566 "sutest.c")))
-  "List of expected tag names for C.")
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Data for Python tests
-
-(defvar semantic-utest-Python-buffer-contents
-"
-def fun1(a,b,c):
-  return a
-
-def fun2(a,b,c): #1
-  return b
-
-"
-
-
-)
-;  "python test case. notice that python is indentation sensitive
-
-
-(defvar semantic-utest-Python-name-contents
-  '(("fun1" function
-     (:arguments
-      (("a" variable nil
-        (reparse-symbol function_parameters)
-       (overlay 10 11 "tst.py"))
-       ("b" variable nil
-        (reparse-symbol function_parameters)
-        (overlay 12 13 "tst.py"))
-       ("c" variable nil
-        (reparse-symbol function_parameters)
-        (overlay 14 15 "tst.py"))))
-     nil (overlay 1 31 "tst.py"))
-    ("fun2" function
-     (:arguments
-      (("a" variable nil
-        (reparse-symbol function_parameters)
-        (overlay 41 42 "tst.py"))
-       ("b" variable nil
-        (reparse-symbol function_parameters)
-        (overlay 43 44 "tst.py"))
-       ("c" variable nil
-        (reparse-symbol function_parameters)
-        (overlay 45 46 "tst.py"))))
-     nil (overlay 32 65 "tst.py")))
-
-  "List of expected tag names for Python.")
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Data for Java tests
-
-(defvar semantic-utest-Java-buffer-contents
-"
-class JavaTest{
-  void fun1(int a,int b){
-    return a;
-  }
-
-  void fun2(int a,int b){ //1
-    return b;
-  }
-
-}
-"
-)
-
-(defvar semantic-utest-Java-name-contents
-  '(("JavaTest" type
-     (:members
-      (("fun1" function
-        (:arguments
-         (("a" variable
-           (:type "int")
-           (reparse-symbol formal_parameters)
-           (overlay 30 35 "JavaTest.java"))
-         ("b" variable
-          (:type "int")
-          (reparse-symbol formal_parameters)
-          (overlay 36 41 "JavaTest.java")))
-         :type "void")
-        (reparse-symbol class_member_declaration)
-        (overlay 20 61 "JavaTest.java"))
-       ("fun2" function
-       (:arguments
-        (("a" variable
-          (:type "int")
-          (reparse-symbol formal_parameters)
-          (overlay 75 80 "JavaTest.java"))
-         ("b" variable
-          (:type "int")
-          (reparse-symbol formal_parameters)
-          (overlay 81 86 "JavaTest.java")))
-        :type "void")
-       (reparse-symbol class_member_declaration)
-       (overlay 65 110 "JavaTest.java")))
-      :type "class")
-     nil (overlay 2 113 "JavaTest.java")))
-  "List of expected tag names for Java."
-  )
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Data for Javascript tests
-
-(defvar semantic-utest-Javascript-buffer-contents
-"
-function fun1(a, b){
-    return a;
-  }
-
-function fun2(a,b){ //1
-    return b;
-  }
-"
-)
-
-
-(defvar semantic-utest-Javascript-name-contents
-  '(("fun1" function
-     (:arguments
-      (("a" variable nil
-       (reparse-symbol FormalParameterList)
-       (overlay 15 16 "tst.js"))
-       ("b" variable nil
-       (reparse-symbol FormalParameterList)
-       (overlay 18 19 "tst.js"))))
-     nil (overlay 1 39 "tst.js"))
-    ("fun2" function
-     (:arguments
-      (("a" variable nil
-       (reparse-symbol FormalParameterList)
-       (overlay 55 56 "tst.js"))
-       ("b" variable nil
-       (reparse-symbol FormalParameterList)
-       (overlay 57 58 "tst.js"))))
-     nil (overlay 41 82 "tst.js")))
-
-  "List of expected tag names for Javascript.")
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Data for Makefile tests
-
-(defvar semantic-utest-Makefile-buffer-contents
-"
-t1:
-\techo t1
-
-t2:t1 #1
-\techo t2
-
-
-"
-)
-
-
-(defvar semantic-utest-Makefile-name-contents
-  '(("t1" function nil nil (overlay 1 9 "Makefile"))
-    ("t2" function
-     (:arguments
-      ("t1"))
-     nil (overlay 18 28 "Makefile")))
-  "List of expected tag names for Makefile.")
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Data for Scheme tests
-
-(defvar semantic-utest-Scheme-buffer-contents
-  "
- (define fun1 2)
-
- (define fun2 3  ;1
-              )
-")
-
-(defvar semantic-utest-Scheme-name-contents
-  '(("fun1" variable
-     (:default-value ("2"))
-     nil (overlay 3 18 "tst.scm"))
-    ("fun2" variable
-     (:default-value ("3"))
-     nil (overlay 21 55 "tst.scm")))
-  )
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Data for Html tests
-
-(defvar semantic-utest-Html-buffer-contents
-  "
-<html>
-  <body>
-    <h1>hello</h1>
-  </body><!--1-->
-</html>
-"
-  )
-
-(defvar semantic-utest-Html-name-contents
-  '(("hello" section
-     (:members
-      (("hello" section nil nil (overlay 21 24 "tst.html"))))
-     nil (overlay 10 15 "tst.html")))
-  )
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Data for PHP tests
-
-(defvar semantic-utest-PHP-buffer-contents
-  "<?php
-
-function fun1(){
-   return \"fun1\";
-}
-
-function fun2($arg1){
-   $output = \"argument to fun2: \" . $arg1;
-   return $output;
-}
-
-class aClass {
-   public function fun1($a, $b){
-      return $a;
-   }
-
-   public function fun2($a, $b){
-      return $b;
-   }
-}
-?> "
-  )
-
-(defvar semantic-utest-PHP-name-contents
-  '(("fun1" function nil
-     nil (overlay 9 45 "phptest.php"))
-    ("fun2" function
-     (:arguments (("$arg1" variable nil (reparse-symbol formal_parameters) 
(overlay 61 66 "phptest.php"))))
-     nil
-     (overlay 47 132 "phptest.php"))
-    ("aClass" type
-     (:members (("fun1" function
-                (:typemodifiers ("public") :arguments
-                                (("$a" variable nil (reparse-symbol 
formal_parameters) (overlay 174 176 "phptest.php"))
-                                 ("$b" variable nil (reparse-symbol 
formal_parameters) (overlay 178 180 "phptest.php"))))
-
-                nil
-                (overlay 153 204 "phptest.php"))
-
-               ("fun2" function
-                (:typemodifiers ("public") :arguments
-                                (("$a" variable nil (reparse-symbol 
formal_parameters) (overlay 230 232 "phptest.php"))
-                                 ("$b" variable nil (reparse-symbol 
formal_parameters) (overlay 234 236 "phptest.php"))
-                                 ))
-                nil
-                (overlay 209 260 "phptest.php"))) :type "class")
-     nil
-     (overlay 135 262 "phptest.php"))
-    )
-  "Expected results from the PHP Unit test"
-  )
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Data for Csharp C# tests
-
-(defvar semantic-utest-Csharp-buffer-contents
-"
-class someClass {
-  int fun1(int a, int b) {
-    return a; }
-  int fun2(int a, int b) {
-    return b; }
-}
-")
-
-(defvar semantic-utest-Csharp-name-contents
-  '(("someClass" type
-     (:members
-      (("fun1" function
-       (:arguments
-        (("a" variable
-          (:type "int")
-          (reparse-symbol formal_parameters)
-          (overlay 30 35 "tst.cs"))
-         ("b" variable
-          (:type "int")
-          (reparse-symbol formal_parameters)
-          (overlay 37 42 "tst.cs")))
-        :type "int")
-       (reparse-symbol class_member_declaration)
-       (overlay 21 61 "tst.cs"))
-       ("fun2" function
-       (:arguments
-        (("a" variable
-          (:type "int")
-          (reparse-symbol formal_parameters)
-          (overlay 73 78 "tst.cs"))
-         ("b" variable
-          (:type "int")
-          (reparse-symbol formal_parameters)
-          (overlay 80 85 "tst.cs")))
-        :type "int")
-       (reparse-symbol class_member_declaration)
-       (overlay 64 104 "tst.cs")))
-      :type "class")
-     nil (overlay 1 106 "tst.cs")))
-  )
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-
-
-(defun semantic-utest-makebuffer (filename contents)
-  "Create a buffer for FILENAME for use in a unit test.
-Pre-fill the buffer with CONTENTS."
-  (let ((buff (semantic-find-file-noselect filename)))
-    (set-buffer buff)
-    (setq buffer-offer-save nil)
-    (font-lock-mode -1) ;; Font lock has issues in Emacs 23
-    (toggle-read-only -1) ;; In case /tmp doesn't exist.
-    (erase-buffer)
-    (insert contents)
-    ;(semantic-fetch-tags) ;JAVE could this go here?
-    (set-buffer-modified-p nil)
-    buff
-    )
-  )
-
-(defun semantic-utest-C ()
-  "Run semantic's C unit test."
-  (interactive)
-  (save-excursion
-    (let ((buff  (semantic-utest-makebuffer semantic-utest-C-filename   
semantic-utest-C-buffer-contents))
-         (buff2 (semantic-utest-makebuffer semantic-utest-C-filename-h 
semantic-utest-C-h-buffer-contents))
-         )
-      (semantic-fetch-tags)
-      (set-buffer buff)
-
-      ;; Turn off a range of modes
-      (semantic-idle-scheduler-mode -1)
-
-      ;; Turn on some modes
-      (semantic-highlight-edits-mode 1)
-
-      ;; Update tags, and show it.
-      (semantic-fetch-tags)
-
-      (switch-to-buffer buff)
-      (sit-for 0)
-
-      ;; Run the tests.
-      ;;(message "First parsing test.")
-      (semantic-utest-verify-names semantic-utest-C-name-contents)
-
-      ;;(message "Invalid tag test.")
-      (semantic-utest-last-invalid semantic-utest-C-name-contents '("fun2") 
"/\\*1\\*/" "/* Deleted this line */")
-      (semantic-utest-verify-names semantic-utest-C-name-contents)
-
-      (set-buffer-modified-p nil)
-      ;; Clean up
-      ;; (kill-buffer buff)
-      ;; (kill-buffer buff2)
-      ))
-  (message "All C tests passed.")
-  )
-
-
-
-
-(defun semantic-utest-generic (testname filename contents name-contents 
names-removed killme insertme)
-  "Generic unit test according to template.
-Should work for languages without .h files, python javascript java.
-TESTNAME is the name of the test.
-FILENAME is the name of the file to create.
-CONTENTS is the contents of the file to test.
-NAME-CONTENTS is the list of names that should be in the contents.
-NAMES-REMOVED is the list of names that gets removed in the removal step.
-KILLME is the name of items to be killed.
-INSERTME is the text to be inserted after the deletion."
-  (save-excursion
-    (let ((buff  (semantic-utest-makebuffer filename  contents))
-         )
-      ;; Turn off a range of modes
-      (semantic-idle-scheduler-mode -1)
-
-      ;; Turn on some modes
-      (semantic-highlight-edits-mode 1)
-
-      ;; Update tags, and show it.
-      (semantic-fetch-tags)
-      (switch-to-buffer buff)
-      (sit-for 0)
-
-      ;; Run the tests.
-      ;;(message "First parsing test %s." testname)
-      (semantic-utest-verify-names name-contents)
-
-      ;;(message "Invalid tag test %s." testname)
-      (semantic-utest-last-invalid name-contents names-removed killme insertme)
-      (semantic-utest-verify-names name-contents)
-
-      (set-buffer-modified-p nil)
-      ;; Clean up
-      ;; (kill-buffer buff)
-      ))
-  (message "All %s tests passed." testname)
-  )
-
-(defun semantic-utest-Python()
-  (interactive)
-  (if (fboundp 'python-mode)
-      (semantic-utest-generic "Python" (semantic-utest-fname "pytest.py") 
semantic-utest-Python-buffer-contents  semantic-utest-Python-name-contents   
'("fun2") "#1" "#deleted line")
-    (message "Skilling Python test: NO major mode."))
-  )
-
-
-(defun semantic-utest-Javascript()
-  (interactive)
-  (if (fboundp 'javascript-mode)
-      (semantic-utest-generic "Javascript" (semantic-utest-fname 
"javascripttest.js") semantic-utest-Javascript-buffer-contents  
semantic-utest-Javascript-name-contents   '("fun2") "//1" "//deleted line")
-    (message "Skipping JavaScript test: NO major mode."))
-  )
-
-(defun semantic-utest-Java()
-  (interactive)
-  ;; If JDE is installed, it might mess things up depending on the version
-  ;; that was installed.
-  (let ((auto-mode-alist  '(("\\.java\\'" . java-mode))))
-    (semantic-utest-generic "Java" (semantic-utest-fname "JavaTest.java") 
semantic-utest-Java-buffer-contents  semantic-utest-Java-name-contents   
'("fun2") "//1" "//deleted line")
-    ))
-
-(defun semantic-utest-Makefile()
-  (interactive)
-  (semantic-utest-generic "Makefile" (semantic-utest-fname "Makefile") 
semantic-utest-Makefile-buffer-contents  semantic-utest-Makefile-name-contents  
 '("fun2") "#1" "#deleted line")
-  )
-
-(defun semantic-utest-Scheme()
-  (interactive)
-  (semantic-utest-generic "Scheme" (semantic-utest-fname "tst.scm") 
semantic-utest-Scheme-buffer-contents  semantic-utest-Scheme-name-contents   
'("fun2") ";1" ";deleted line")
-  )
-
-
-(defun semantic-utest-Html()
-  (interactive)
-  ;; Disable html-helper auto-fill-in mode.
-  (let ((html-helper-build-new-buffer nil))
-    (semantic-utest-generic "HTML" (semantic-utest-fname "tst.html") 
semantic-utest-Html-buffer-contents  semantic-utest-Html-name-contents   
'("fun2") "<!--1-->" "<!--deleted line-->")
-    ))
-
-(defun semantic-utest-PHP()
-  (interactive)
-  (if (fboundp 'php-mode)
-      (semantic-utest-generic "PHP" (semantic-utest-fname "phptest.php") 
semantic-utest-PHP-buffer-contents semantic-utest-PHP-name-contents '("fun1") 
"fun2" "%^@")
-    (message "Skipping PHP Test.  No php-mode loaded."))
-  )
-
-;look at http://mfgames.com/linux/csharp-mode
-(defun semantic-utest-Csharp() ;; hmm i don't even know how to edit a scharp 
file. need a csharp mode implementation i suppose
-  (interactive)
-  (if (fboundp 'csharp-mode)
-      (semantic-utest-generic "C#" (semantic-utest-fname "csharptest.cs") 
semantic-utest-Csharp-buffer-contents  semantic-utest-Csharp-name-contents   
'("fun2") "//1" "//deleted line")
-    (message "Skipping C# test.  No csharp-mode loaded."))
-  )
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; stubs
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; stuff for Erlang
-;;-module(hello).
-;-export([hello_world/0]).
-;
-;hello_world()->
-;    io:format("Hello World ~n").
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;(defun semantic-utest-Erlang()
-;  (interactive)
-;  (semantic-utest-generic "Erlang" (semantic-utest-fname "tst.erl") 
semantic-utest-Erlang-buffer-contents  semantic-utest-Erlang-name-contents   
'("fun2") "//1" "//deleted line")
-;  )
-;
-;;texi is also supported
-;(defun semantic-utest-Texi()
-;  (interactive)
-;  (semantic-utest-generic "texi" (semantic-utest-fname "tst.texi") 
semantic-utest-Texi-buffer-contents  semantic-utest-Texi-name-contents   
'("fun2") "//1" "//deleted line")
-;  )
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;;;###autoload
-(defun semantic-utest-main()
-  (interactive)
-  "call all utests"
-  (cedet-utest-log-start "multi-lang parsing")
-  (cedet-utest-log " * C tests...")
-  (semantic-utest-C)
-  (cedet-utest-log " * Python tests...")
-  (semantic-utest-Python)
-  (cedet-utest-log " * Java tests...")
-  (semantic-utest-Java)
-  (cedet-utest-log " * Javascript tests...")
-  (semantic-utest-Javascript)
-  (cedet-utest-log " * Makefile tests...")
-  (semantic-utest-Makefile)
-  (cedet-utest-log " * Scheme tests...")
-  (semantic-utest-Scheme)
-  (cedet-utest-log " * Html tests...")
-  (semantic-utest-Html)
-  (cedet-utest-log " * PHP tests...")
-  (semantic-utest-PHP)
-  (cedet-utest-log " * Csharp tests...")
-  (semantic-utest-Csharp)
-
-  (cedet-utest-log-shutdown "multi-lang parsing")
-  )
-
-;;; Buffer contents validation
-;;
-(defun semantic-utest-match-attributes (attr1 attr2 skipnames)
-  "Compare attribute lists ATTR1 and ATTR2.
-Argument SKIPNAMES is a list of names that may be child nodes to skip."
-  (let ((res t))
-    (while (and res attr1 attr2)
-
-      ;; Compare
-      (setq res
-           (cond ((and (listp (car attr1))
-                       (semantic-tag-p (car (car attr1))))
-                  ;; Compare the list of tags...
-                  (semantic-utest-taglists-equivalent-p
-                   (car attr2) (car attr1) skipnames)
-                  )
-                 (t
-                  (equal (car attr1) (car attr2)))))
-
-      (if (not res)
-         (error "TAG INTERNAL DIFF: %S %S"
-                (car attr1) (car attr2)))
-
-      (setq attr1 (cdr attr1)
-           attr2 (cdr attr2)))
-    res))
-
-(defun semantic-utest-equivalent-tag-p (tag1 tag2 skipnames)
-  "Determine if TAG1 and TAG2 are the same.
-SKIPNAMES includes lists of possible child nodes that should be missing."
-  (and (equal (semantic-tag-name tag1) (semantic-tag-name tag2))
-       (semantic-tag-of-class-p tag1 (semantic-tag-class tag2))
-       (semantic-utest-match-attributes
-       (semantic-tag-attributes tag1) (semantic-tag-attributes tag2)
-       skipnames)
-       ))
-
-(defun semantic-utest-taglists-equivalent-p (table names skipnames)
-  "Compare TABLE and NAMES, where skipnames allow list1 to be different.
-SKIPNAMES is a list of names that should be skipped in the NAMES list."
-  (let ((SN skipnames))
-    (while SN
-      (setq names (remove (car SN) names))
-      (setq SN (cdr SN))))
-  (while (and names table)
-    (if (not (semantic-utest-equivalent-tag-p (car names)
-                                             (car table)
-                                             skipnames))
-       (error "Expected %s, found %s"
-              (semantic-format-tag-prototype (car names))
-              (semantic-format-tag-prototype (car table))))
-    (setq names (cdr names)
-         table (cdr table)))
-  (when names (error "Items forgotten: %S"
-                    (mapcar 'semantic-tag-name names)
-                    ))
-  (when table (error "Items extra: %S"
-                    (mapcar 'semantic-tag-name table)))
-  t)
-
-(defun semantic-utest-verify-names (name-contents &optional skipnames)
-  "Verify the names of the test buffer from NAME-CONTENTS.
-Argument SKIPNAMES is a list of names that should be skipped
-when analyzing the file.
-
-JAVE this thing would need to be recursive to handle java and csharp"
-  (let ((names name-contents)
-       (table (semantic-fetch-tags))
-       )
-    (semantic-utest-taglists-equivalent-p table names skipnames)
-    ))
-
-;;;;;;;;;;;;;;;;;;;;;;;;
-; JAVE redefine a  new validation function
-; is not quite as good as the old one yet
-(defun semantic-utest-verify-names-jave (name-contents &optional skipnames)
-  "JAVE version of `semantic-utest-verify-names'.
-NAME-CONTENTS is a sample of the tags buffer to test against.
-SKIPNAMES is a list of names to remove from NAME-CONTENTS"
- (assert (semantic-utest-verify-names-2 name-contents (semantic-fetch-tags))
-        nil "failed test")
-)
-
-(defun semantic-utest-verify-names-2 (l1 l2)
-  (cond   ( (and (consp l1) (equal (car l1) 'overlay))
-            (overlayp l2))
-          ((not (consp l1))
-           (equal l1 l2))
-          ((consp l1)
-           (and (semantic-utest-verify-names-2 (car l1) (car l2)) 
(semantic-utest-verify-names-2 (cdr l1) (cdr l2))))
-          (t (error "internal error"))))
-
-
-
-
-
-;;; Kill indicator line
-;;
-(defvar semantic-utest-last-kill-text nil
-  "The text from the last kill.")
-
-(defvar semantic-utest-last-kill-pos nil
-  "The position of the last kill.")
-
-(defun semantic-utest-kill-indicator ( killme insertme)
-  "Kill the line with KILLME on it and insert INSERTME in its place."
-  (goto-char (point-min))
-;  (re-search-forward (concat "/\\*" indicator "\\*/")); JAVE this isn't 
generic enough for different languages
-  (re-search-forward killme)
-  (beginning-of-line)
-  (setq semantic-utest-last-kill-pos (point))
-  (setq semantic-utest-last-kill-text
-       (buffer-substring (point) (point-at-eol)))
-  (delete-region (point) (point-at-eol))
-  (insert insertme)
-  (sit-for 0)
-)
-
-(defun semantic-utest-unkill-indicator ()
-  "Unkill the last indicator."
-  (goto-char semantic-utest-last-kill-pos)
-  (delete-region (point) (point-at-eol))
-  (insert semantic-utest-last-kill-text)
-  (sit-for 0)
-  )
-
-;;;  EDITING TESTS
-;;
-
-(defun semantic-utest-last-invalid (name-contents names-removed killme 
insertme)
-  "Make the last fcn invalid."
-  (semantic-utest-kill-indicator killme insertme)
-;  (semantic-utest-verify-names name-contents names-removed); verify its gone 
;new validator doesn't handle skipnames yet
-  (semantic-utest-unkill-indicator);put back killed stuff
-  )
-
-
-
-
-;"#<overlay from \\([0-9]+\\) to \\([0-9]+\\) in \\([^>]*\\)>"
-;#<overlay from \([0-9]+\) to \([0-9]+\) in \([^>]*\)>
-;(overlay \1 \2 "\3")
-
-
-;; JAVE
-;; these are some unit tests for cedet that I got from Eric and modified a bit 
for:
-;;   python
-;;   javascript
-;;   java
-;; I tried to generalize the structure of the tests a bit to make it easier to 
add languages
-
-;; Mail from Eric:
-;; Many items in the checklist look like:
-
-;;       M-x global-semantic-highlight-edits-mode RET
-;;       - Edit a file.  See the highlight of newly inserted text.
-;;       - Customize `semantic-edits-verbose-flag' to be non-nil.
-;;       - Wait for the idle scheduler, it should clean up the edits.
-;;         - observe messages from incremental parser.  Do they relate
-;;       to the edits?
-;;       - M-x bovinate RET - verify your changes are reflected.
-
-;; It's all about watching the behavior.  Timers go off, things get
-;; cleaned up, you type in new changes, etc.  An example I tried to
-;; do is below, but covers only 1 language, and not very well at that.
-;; I seem to remember seeing a unit test framework going by one of the
-;; lists.  I'm not sure if that would help.
-
-;; Another that might be automatable:
-
-;;       M-x semantic-analyze-current-context RET
-;;        - Do this in different contexts in your language
-;;          files.   Verify that reasonable results are returned
-;;          such as identification of assignments, function arguments, etc.
-
-;; Anyway, those are some ideas.  Any effort you put it will be helpful!
-
-;; Thanks
-;; Eric
-
-;; -----------
-
-
-
-;;; semantic-utest.el ends here
diff --git a/test/manual/cedet/srecode-tests.el 
b/test/manual/cedet/srecode-tests.el
deleted file mode 100644
index 36256a7..0000000
--- a/test/manual/cedet/srecode-tests.el
+++ /dev/null
@@ -1,296 +0,0 @@
-;;; srecode-tests.el --- Some tests for CEDET's srecode
-
-;; Copyright (C) 2008-2017 Free Software Foundation, Inc.
-
-;; Author: Eric M. Ludlam <address@hidden>
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Extracted from srecode-fields.el and srecode-document.el in the
-;; CEDET distribution.
-
-;;; Code:
-
-;;; From srecode-fields:
-
-(require 'srecode/fields)
-
-(defvar srecode-field-utest-text
-  "This is a test buffer.
-
-It is filled with some text."
-  "Text for tests.")
-
-(defun srecode-field-utest ()
-  "Test the srecode field manager."
-  (interactive)
-  (if (featurep 'xemacs)
-      (message "There is no XEmacs support for SRecode Fields.")
-    (srecode-field-utest-impl)))
-
-(defun srecode-field-utest-impl ()
-  "Implementation of the SRecode field utest."
-  (save-excursion
-    (find-file "/tmp/srecode-field-test.txt")
-
-    (erase-buffer)
-    (goto-char (point-min))
-    (insert srecode-field-utest-text)
-    (set-buffer-modified-p nil)
-
-    ;; Test basic field generation.
-    (let ((srecode-field-archive nil)
-         (f nil))
-
-      (end-of-line)
-      (forward-word -1)
-
-      (setq f (srecode-field "Test"
-                            :name "TEST"
-                            :start 6
-                            :end 8))
-
-      (when (or (not (slot-boundp f 'overlay)) (not (oref f overlay)))
-       (error "Field test: Overlay info not created for field"))
-
-      (when (and (overlay-p (oref f overlay))
-                (not (overlay-get (oref f overlay) 'srecode-init-only)))
-       (error "Field creation overlay is not tagged w/ init flag"))
-
-      (srecode-overlaid-activate f)
-
-      (when (or (not (overlay-p (oref f overlay)))
-               (overlay-get (oref f overlay) 'srecode-init-only))
-       (error "New field overlay not created during activation"))
-
-      (when (not (= (length srecode-field-archive) 1))
-       (error "Field test: Incorrect number of elements in the field archive"))
-      (when (not (eq f (car srecode-field-archive)))
-       (error "Field test: Field did not auto-add itself to the field 
archive"))
-
-      (when (not (overlay-get (oref f overlay) 'keymap))
-       (error "Field test: Overlay keymap not set"))
-
-      (when (not (string= "is" (srecode-overlaid-text f)))
-       (error "Field test: Expected field text 'is', not %s"
-              (srecode-overlaid-text f)))
-
-      ;; Test deletion.
-      (srecode-delete f)
-
-      (when (slot-boundp f 'overlay)
-       (error "Field test: Overlay not deleted after object delete"))
-      )
-
-    ;; Test basic region construction.
-    (let* ((srecode-field-archive nil)
-          (reg nil)
-          (fields
-           (list
-            (srecode-field "Test1" :name "TEST-1" :start 5 :end 10)
-            (srecode-field "Test2" :name "TEST-2" :start 15 :end 20)
-            (srecode-field "Test3" :name "TEST-3" :start 25 :end 30)
-
-            (srecode-field "Test4" :name "TEST-4" :start 35 :end 35))
-           ))
-
-      (when (not (= (length srecode-field-archive) 4))
-       (error "Region Test: Found %d fields.  Expected 4"
-              (length srecode-field-archive)))
-
-      (setq reg (srecode-template-inserted-region "REG"
-                                                 :start 4
-                                                 :end 40))
-
-      (srecode-overlaid-activate reg)
-
-      ;; Make sure it was cleared.
-      (when srecode-field-archive
-       (error "Region Test: Did not clear field archive"))
-
-      ;; Auto-positioning.
-      (when (not (eq (point) 5))
-       (error "Region Test: Did not reposition on first field"))
-
-      ;; Active region
-      (when (not (eq (srecode-active-template-region) reg))
-       (error "Region Test: Active region not set"))
-
-      ;; Various sizes
-      (mapc (lambda (T)
-             (if (string= (object-name-string T) "Test4")
-                 (progn
-                   (when (not (srecode-empty-region-p T))
-                     (error "Field %s is not empty"
-                            (object-name T)))
-                   )
-               (when (not (= (srecode-region-size T) 5))
-                 (error "Calculated size of %s was not 5"
-                        (object-name T)))))
-           fields)
-
-      ;; Make sure things stay up after a 'command'.
-      (srecode-field-post-command)
-      (when (not (eq (srecode-active-template-region) reg))
-       (error "Region Test: Active region did not stay up"))
-
-      ;; Test field movement.
-      (when (not (eq (srecode-overlaid-at-point 'srecode-field)
-                    (nth 0 fields)))
-       (error "Region Test: Field %s not under point"
-              (object-name (nth 0 fields))))
-
-      (srecode-field-next)
-
-      (when (not (eq (srecode-overlaid-at-point 'srecode-field)
-                    (nth 1 fields)))
-       (error "Region Test: Field %s not under point"
-              (object-name (nth 1 fields))))
-
-      (srecode-field-prev)
-
-      (when (not (eq (srecode-overlaid-at-point 'srecode-field)
-                    (nth 0 fields)))
-       (error "Region Test: Field %s not under point"
-              (object-name (nth 0 fields))))
-
-      ;; Move cursor out of the region and have everything cleaned up.
-      (goto-char 42)
-      (srecode-field-post-command)
-      (when (srecode-active-template-region)
-       (error "Region Test: Active region did not clear on move out"))
-
-      (mapc (lambda (T)
-             (when (slot-boundp T 'overlay)
-               (error "Overlay did not clear off of field %s"
-                      (object-name T))))
-           fields)
-
-      ;; End of LET
-      )
-
-    ;; Test variable linkage.
-    (let* ((srecode-field-archive nil)
-          (f1 (srecode-field "Test1" :name "TEST" :start 6 :end 8))
-          (f2 (srecode-field "Test2" :name "TEST" :start 28 :end 30))
-          (f3 (srecode-field "Test3" :name "NOTTEST" :start 35 :end 40))
-          (reg (srecode-template-inserted-region "REG" :start 4 :end 40))
-          )
-      (srecode-overlaid-activate reg)
-
-      (when (not (string= (srecode-overlaid-text f1)
-                         (srecode-overlaid-text f2)))
-       (error "Linkage Test: Init strings are not ="))
-      (when (string= (srecode-overlaid-text f1)
-                    (srecode-overlaid-text f3))
-       (error "Linkage Test: Init string on dissimilar fields is now the 
same"))
-
-      (goto-char 7)
-      (insert "a")
-
-      (when (not (string= (srecode-overlaid-text f1)
-                         (srecode-overlaid-text f2)))
-       (error "Linkage Test: mid-insert strings are not ="))
-      (when (string= (srecode-overlaid-text f1)
-                    (srecode-overlaid-text f3))
-       (error "Linkage Test: mid-insert string on dissimilar fields is now the 
same"))
-
-      (goto-char 9)
-      (insert "t")
-
-      (when (not (string= (srecode-overlaid-text f1) "iast"))
-       (error "Linkage Test: tail-insert failed to captured added char"))
-      (when (not (string= (srecode-overlaid-text f1)
-                         (srecode-overlaid-text f2)))
-       (error "Linkage Test: tail-insert strings are not ="))
-      (when (string= (srecode-overlaid-text f1)
-                    (srecode-overlaid-text f3))
-       (error "Linkage Test: tail-insert string on dissimilar fields is now 
the same"))
-
-      (goto-char 6)
-      (insert "b")
-
-      (when (not (string= (srecode-overlaid-text f1) "biast"))
-       (error "Linkage Test: tail-insert failed to captured added char"))
-      (when (not (string= (srecode-overlaid-text f1)
-                         (srecode-overlaid-text f2)))
-       (error "Linkage Test: tail-insert strings are not ="))
-      (when (string= (srecode-overlaid-text f1)
-                    (srecode-overlaid-text f3))
-       (error "Linkage Test: tail-insert string on dissimilar fields is now 
the same"))
-
-      ;; Cleanup
-      (srecode-delete reg)
-      )
-
-    (set-buffer-modified-p nil)
-
-    (message "   All field tests passed.")
-    ))
-
-;;; From srecode-document:
-
-(require 'srecode/doc)
-
-(defun srecode-document-function-comment-extract-test ()
-  "Test old comment extraction.
-Dump out the extracted dictionary."
-  (interactive)
-
-  (srecode-load-tables-for-mode major-mode)
-  (srecode-load-tables-for-mode major-mode 'document)
-
-  (if (not (srecode-table))
-      (error "No template table found for mode %s" major-mode))
-
-  (let* ((temp (srecode-template-get-table (srecode-table)
-                                          "function-comment"
-                                          "declaration"
-                                          'document))
-        (fcn-in (semantic-current-tag)))
-
-    (if (not temp)
-       (error "No templates for function comments"))
-
-    ;; Try to figure out the tag we want to use.
-    (when (or (not fcn-in)
-             (not (semantic-tag-of-class-p fcn-in 'function)))
-      (error "No tag of class 'function to insert comment for"))
-
-    (let ((lextok (semantic-documentation-comment-preceding-tag fcn-in 'lex))
-         )
-
-      (when (not lextok)
-       (error "No comment to attempt an extraction"))
-
-      (let ((s (semantic-lex-token-start lextok))
-           (e (semantic-lex-token-end lextok))
-           (extract nil))
-
-       (pulse-momentary-highlight-region s e)
-
-       ;; Extract text from the existing comment.
-       (setq extract (srecode-extract temp s e))
-
-       (with-output-to-temp-buffer "*SRECODE DUMP*"
-         (princ "EXTRACTED DICTIONARY FOR ")
-         (princ (semantic-tag-name fcn-in))
-         (princ "\n--------------------------------------------\n")
-         (srecode-dump extract))))))
-
-;;; srecode-tests.el ends here
diff --git a/test/manual/cedet/tests/test.c b/test/manual/cedet/tests/test.c
deleted file mode 100644
index a464869..0000000
--- a/test/manual/cedet/tests/test.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/* test.c --- Semantic unit test for C.
-
-   Copyright (C) 2001-2017 Free Software Foundation, Inc.
-
-   Author: Eric M. Ludlam <address@hidden>
-
-   This file is part of GNU Emacs.
-
-   GNU Emacs is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   GNU Emacs is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/* Attempt to include as many aspects of the C language as possible.
- */
-
-/* types of include files */
-#include "includeme1.h"
-#include <includeme2.h>
-#include <subdir/includeme3.h>
-#include <includeme.notanhfile>
-#include <stdlib.h>
-#include <cmath>
-
-#if 0
-int dont_show_function()
-{
-}
-#endif
-
-/* Global types */
-struct mystruct1 {
-  int slot11;
-  char slot12;
-  float slot13;
-};
-
-struct mystruct2 {
-  int slot21;
-  char slot22;
-  float slot23;
-} var_of_type_mystruct2;
-
-struct {
-  int slot31;
-  char slot32;
-  float slot33;
-} var_of_anonymous_struct;  
-
-typedef struct mystruct1 typedef_of_mystruct1;
-typedef struct mystruct1 *typedef_of_pointer_mystruct1;
-typedef struct { int slot_a; } typedef_of_anonymous_struct;
-typedef struct A {
-} B;
-
-typedef struct mystruct1 td1, td2;
-
-union myunion1 {
-  int slot41;
-  char slot42;
-  float slot43;
-};
-
-union myunion2 {
-  int slot51;
-  char slot52;
-  float slot53;
-} var_of_type_myunion2;
-
-struct {
-  int slot61;
-  char slot72;
-  float slot83;
-} var_of_anonymous_union;  
-
-typedef union myunion1 typedef_of_myunion1;
-typedef union myunion1 *typedef_of_pointer_myunion1;
-typedef union { int slot_a; } typedef_of_anonymous_union;
-
-enum myenum1 { enum11 = 1, enum12 };
-enum myenum2 { enum21, enum22 = 2 } var_of_type_myenum2;
-enum { enum31, enum32 } var_of_anonymous_enum;
-
-typedef enum myenum1 typedef_of_myenum1;
-typedef enum myenum1 *typedef_of_pointer_myenum1;
-typedef enum { enum_a = 3, enum_b } typedef_of_anonymous_enum;
-
-typedef int typedef_of_int;
-
-/* Here are some simpler variable types */
-int var1;
-int varbit1:1;
-char var2;
-float var3;
-mystruct1 var3;
-struct mystruct1 var4;
-union myunion1 var5;
-enum myenum1 var6;
-
-char *varp1;
-char **varp2;
-char varv1[1];
-char varv2[1][2];
-
-char *varpa1 = "moose";
-struct mystruct2 vara2 = { 1, 'a', 0.0 };
-enum myenum1 vara3 = enum11;
-int vara4 = (int)0.0;
-int vara5 = funcall();
-
-int mvar1, mvar2, mvar3;
-char *mvarp1, *mvarp2, *mvarp3;
-char *mvarpa1 = 'a', *mvarpa2 = 'b', *mvarpa3 = 'c';
-char mvaras1[10], mvaras2[12][13], *mvaras3 = 'd';
-
-static register const unsigned int tmvar1;
-
-#define MACRO1 1
-#define MACRO2(foo) (1+foo)
-
-/* Here are some function prototypes */
-
-/* This is legal, but I decided not to support inferred integer
- * types on functions and variables.
- */
-fun0();
-int funp1();
-char funp2(int arg11);
-float funp3(char arg21, char arg22);
-struct mystrct1 funp4(struct mystruct2 arg31, union myunion2 arg32);
-enum myenum1 funp5(char *arg41, union myunion1 *arg42);
-
-char funpp1 __P(char argp1, struct mystruct2 argp2, char *arg4p);
-
-int fun1();
-
-/* Here is a function pointer */
-int (*funcptr)(int a, int b);
-
-/* Function Definitions */
-
-/* This is legal, but I decided not to support inferred integer
- * types on functions and variables.
- */
-fun0()
-{
-  int sv = 0;
-}
-
-int fun1 ()
-{
-  int sv = 1;
-}
-
-int fun1p1 (void)
-{
-  int sv = 1;
-}
-
-char fun2(int arg_11)
-{
-  char sv = 2;
-}
-
-float fun3(char arg_21, char arg_22)
-{
-  char sv = 3;
-}
-
-struct mystrct1 fun4(struct mystruct2 arg31, union myunion2 arg32)
-{
-  sv = 4;
-}
-
-enum myenum1 fun5(char *arg41, union myunion1 *arg42)
-{
-  sv = 5;
-}
-
-/* Functions with K&R syntax. */
-struct mystrct1 funk1(arg_31, arg_32)
-     struct mystruct2 arg_31;
-     union myunion2 arg32;
-{
-  sv = 4;
-}
-
-enum myenum1 *funk2(arg_41, arg_42)
-     char *arg_41;
-     union myunion1 *arg_42;
-{
-  sv = 5;
-
-  if(foo) {
-  }
-}
-
-int funk3(arg_51, arg_53)
-     int arg_51;
-     char arg_53;
-{
-  char q = 'a';
-  int sv = 6;
-  td1 ms1;
-  enum myenum1 testconst;
-
-  /* Function argument analysis */
-  funk3(ms1.slot11, arg_53 );
-  sv = 7;
-
-  /* Slot deref on assignee */
-  ms1.slot11 = s;
-
-  /* Enum/const completion */
-  testconst = e;
-
-  /* Bad var/slot and param */
-  blah.notafunction(moose);
-
-  /* Print something. */
-  printf("Moose", );
-
-  tan();
-}
-
-int funk4_fixme(arg_61, arg_62)
-     int arg_61, arg_62;
-{
-  
-}
-
-/* End of C tests */
-
diff --git a/test/manual/cedet/tests/test.el b/test/manual/cedet/tests/test.el
deleted file mode 100644
index a0efd40..0000000
--- a/test/manual/cedet/tests/test.el
+++ /dev/null
@@ -1,158 +0,0 @@
-;;; test.el --- Unit test file for Semantic Emacs Lisp support.
-
-;; Copyright (C) 2005-2017 Free Software Foundation, Inc.
-
-;; Author: Eric M. Ludlam <address@hidden>
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Require
-;;
-(require 'semantic)
-(require 'eieio "../eieio")
-
-;; tags encapsulated in eval-when-compile and eval-and-compile
-;; should be expanded out into the outer environment.
-(eval-when-compile
-  (require 'semantic-imenu)
-  )
-
-(eval-and-compile
-  (defconst const-1 nil)
-  (defun function-1 (arg)
-    nil)
-  )
-
-;;; Functions
-;;
-(defun a-defun (arg1 arg2 &optional arg3)
-  "doc a"
-  nil)
-
-(defun a-defun-interactive (arg1 arg2 &optional arg3)
-  "doc a that is a command"
-  (interactive "R")
-  nil)
-
-(defun* a-defun* (arg1 arg2 &optional arg3)
-  "doc a*"
-  nil)
-
-(defsubst a-defsubst (arg1 arg2 &optional arg3)
-  "doc a-subst"
-  nil)
-
-(defmacro a-defmacro (arg1 arg2 &optional arg3)
-  "doc a-macro"
-  nil)
-
-(define-overload a-overload (arg)
-  "doc a-overload"
-  nil)
-
-;;; Methods
-;;
-(defmethod a-method ((obj some-class) &optional arg2)
-  "Doc String for a method."
-  (call-next-method))
-
-(defgeneric a-generic (arg1 arg2)
-  "General description of a-generic.")
-
-;;; Advice
-;;
-(defadvice existing-function-to-advise (around test activate)
-  "Do something special to this fcn."
-  (ad-do-it))
-
-;;; Variables
-;;
-(defvar a-defvar (cons 1 2)
-  "Variable a")
-
-(defvar a-defvar-star (cons 1 2)
-  "*User visible var a")
-
-(defconst a-defconst 'a "var doc const")
-
-(defcustom a-defcustom nil
-  "doc custom"
-  :group 'a-defgroup
-  :type 'boolean)
-
-(defface a-defface 'bold
-  "A face that is bold.")
-
-(defimage ezimage-page-minus
-  ((:type xpm :file "page-minus.xpm" :ascent center))
-  "Image used for open files with stuff in them.")
-
-;;; Autoloads
-;;
-(autoload (quote a-autoload) "somefile"
-  "Non-interactive autoload." nil nil)
-
-(autoload (quote a-autoload-interactive) "somefile"
-"Interactive autoload." t nil)
-
-
-(defgroup a-defgroup nil
-  "Group for `emacs-lisp' regression-test")
-
-;;; Classes
-;;
-(defclass a-class (a-parent)
-  ((slot-1)
-   (slot-2 :initarg :slot-2)
-   (slot-3 :documentation "Doc about slot3")
-   (slot-4 :type 'boolean)
-   )
-  "Doc String for class.")
-
-(defclass a-class-abstract ()
-  nil
-  "Doc string for abstract class."
-  :abstract t)
-
-;;; Structures
-;;
-(defstruct (test-struct-1 :test 'equal)
-  (slot-1 :equal 'eq)
-  slot-2)
-
-(defstruct test-struct-2
-  slot-1
-  slot-2)
-
-;;; Semantic specific macros
-;;
-(define-lex a-lexer
-  "Doc String"
-  this
-  that)
-
-(define-mode-local-override a-overridden-function
-  emacs-lisp-mode (tag)
-  "A function that is overloaded."
-  nil)
-
-(defvar-mode-local emacs-lisp-mode a-mode-local-def
-  "some value")
-
-
-;;; Provide
-;;
-(provide 'test)
diff --git a/test/manual/cedet/tests/test.make 
b/test/manual/cedet/tests/test.make
deleted file mode 100644
index 46421da..0000000
--- a/test/manual/cedet/tests/test.make
+++ /dev/null
@@ -1,79 +0,0 @@
-# test.make --- Semantic unit test for Make -*- makefile -*-
-
-# Copyright (C) 2001-2002, 2010-2017 Free Software Foundation, Inc.
-
-# Author: Eric M. Ludlam <address@hidden>
-
-# This file is part of GNU Emacs.
-
-# GNU Emacs is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# GNU Emacs is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-top=
-ede_FILES=Project.ede Makefile
-
-example_MISC=semantic-skel.el skeleton.bnf
-init_LISP=semantic-load.el
-DISTDIR=$(top)semantic-$(VERSION)
-
-# really goofy & variables tabs
-A=      B
-A       =B
-A=B     C
-A=B\
-        C
-
-A=     http://${B} \
-       ftp://${B}
-B=     test
-
-all: example semantic Languages tools senator semantic.info
-
-test ${B}: foo bar
-       @echo ${A}
-
-example: 
-       @
-
-init: $(init_LISP)
-       @echo "(add-to-list 'load-path nil)" > address@hidden
-       @if test ! -z "${LOADPATH}" ; then\
-          for loadpath in ${LOADPATH}; do \
-             echo "(add-to-list 'load-path \"$$loadpath\")" >> address@hidden; 
\
-           done;\
-       fi
-       @echo "(setq debug-on-error t)" >> address@hidden
-       $(EMACS) -batch -l address@hidden -f batch-byte-compile $^
-
-include tesset.mk tusset.mk
-include oneset.mk
-
-ifdef SOME_SYMBOL
-  VAR1 = foo
-else
-  VAR1 = bar
-endif
-
-ifndef SOME_OTHER_SYMBOL
-  VAR1 = baz
-endif
-
-ifeq ($(VAR1), foo)
-  VAR2 = gleep
-else
-  ifneq ($(VAR1), foo)
-    VAR2 = glop
-  endif
-endif
-
-# End of Makefile
diff --git a/test/manual/cedet/tests/testdoublens.cpp 
b/test/manual/cedet/tests/testdoublens.cpp
deleted file mode 100644
index e9a6ba5..0000000
--- a/test/manual/cedet/tests/testdoublens.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-// testdoublens.cpp --- semantic-ia-utest completion engine unit tests
-
-// Copyright (C) 2008-2017 Free Software Foundation, Inc.
-
-// Author: Eric M. Ludlam <address@hidden>
-
-// This file is part of GNU Emacs.
-
-// GNU Emacs is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// GNU Emacs is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "testdoublens.hpp"
-
-namespace Name1 {
-  namespace Name2 {
-
-    Foo::Foo()
-    {
-      p// -1-
-       // #1# ( "pMumble" "publishStuff" )
-       ;
-    }
-
-    int Foo::get() // ^1^
-    {
-      p// -2-
-       // #2# ( "pMumble" "publishStuff" )
-       ;
-      return 0;
-    }
-
-    void Foo::publishStuff(int /* a */, int /* b */) // ^2^
-    {
-    }
-
-    void Foo::sendStuff(int /* a */, int /* b */) // ^3^
-    {
-    }
-
-  } // namespace Name2
-} // namespace Name1
-
-// Test multiple levels of metatype expansion
-int test_fcn () {
-  stage3_Foo MyFoo;
-
-  MyFoo.// -3-
-    // #3# ( "Mumble" "get" )
-    ;
-
-  Name1::Name2::F//-4-
-    // #4# ( "Foo" )
-    ;
-
-  // @TODO - get this working...
-  Name1::stage2_Foo::M//-5-
-    /// #5# ( "Mumble" )
-    ;
-}
-
-stage3_Foo foo_fcn() {
-  // Can we go "up" to foo with senator-go-to-up-reference?
-}
-
-
-// Second test from Ravikiran Rajagopal
-
-namespace A {
-  class foo {
-  public:
-    void aa();
-    void bb();
-  };
-}
-namespace A {
-  class bar {
-  public:
-    void xx();
-  public:
-    foo myFoo;
-  };
-
-  void bar::xx()
-  {
-    myFoo.// -6- <--- cursor is here after the dot
-      // #6# ( "aa" "bb" )
-      ;
-  }
-}
-
-// Double namespace example from Hannu Koivisto
-//
-// This is tricky because the parent class "Foo" is found within the
-// scope of B, so the scope calculation needs to put that together
-// before searching for parents in scope.
-namespace a {
-  namespace b {
-
-    class Bar : public Foo
-    {
-      int baz();
-    };
-
-    int Bar::baz()
-    {
-      return dum// -7-
-       // #7# ( "dumdum" )
-       ;
-    }
-
-  } // namespace b
-} // namespace a
-
-// Three namespace example from Hannu Koivisto
-//
-// This one is special in that the name e::Foo, where "e" is in
-// the scope, and not referenced from the global namespace.  This
-// wasn't previously handled, so the fullscope needed to be added
-// to the list of things searched when in split-name decent search mode
-// for scopes.
-
-namespace d {
-  namespace e {
-
-    class Foo
-    {
-    public:
-      int write();
-    };
-
-  } // namespace d
-} // namespace e
-
-
-namespace d {
-  namespace f {
-
-    class Bar
-    {
-    public:
-      int baz();
-
-    private:
-      e::Foo &foo;
-    };
-
-    int Bar::baz()
-    {
-      return foo.w// -8-
-       // #8# ( "write" )
-       ;
-    }
-
-  } // namespace f
-} // namespace d
-
diff --git a/test/manual/cedet/tests/testdoublens.hpp 
b/test/manual/cedet/tests/testdoublens.hpp
deleted file mode 100644
index 556f068..0000000
--- a/test/manual/cedet/tests/testdoublens.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// testdoublens.hpp --- Header file used in one of the Semantic tests
-
-// Copyright (C) 2008-2017 Free Software Foundation, Inc.
-
-// Author: Eric M. Ludlam <address@hidden>
-
-// This file is part of GNU Emacs.
-
-// GNU Emacs is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// GNU Emacs is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-namespace Name1 {
-  namespace Name2 {
-
-    class Foo
-    {
-      typedef unsigned int Mumble;
-    public:
-      Foo();
-      ~Foo();
-      int get();
-
-    private:
-      void publishStuff(int a, int b);
-
-      void sendStuff(int a, int b);
-    
-      Mumble* pMumble;
-    };
-
-    typedef Foo stage1_Foo;
-
-  } // namespace Name2
-
-  typedef Name2::stage1_Foo stage2_Foo;
-
-  typedef Name2::Foo decl_stage1_Foo;
-
-} // namespace Name1
-
-typedef Name1::stage2_Foo stage3_Foo;
-
-
-// Double namespace from Hannu Koivisto
-namespace a {
-  namespace b {
-
-    class Foo
-    {
-      struct Dum {
-        int diDum;
-      };
-
-    protected:
-      mutable a::b::Foo::Dum dumdum;
-    };
-
-  } // namespace b
-} // namespace a
-
diff --git a/test/manual/cedet/tests/testfriends.cpp 
b/test/manual/cedet/tests/testfriends.cpp
deleted file mode 100644
index 20425f9..0000000
--- a/test/manual/cedet/tests/testfriends.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// Test parsing of friends and how they are used in completion.
-/*
-  >>  Thanks Damien Profeta for the nice example.
-  >
-  >  I paste a small example.
-  >  It would be great if friend can be well parsed and even greater if
-  >  class B can access to all the members of A.
-*/
-
-class Af // %2% ( ( "testfriends.cpp" ) ( "Af" "B::testB" ) )
-{
-public:
-  int pubVar;
-private:
-  int privateVar;
-
-  friend class B;
-
-};
-
-class B
-{
-public:
-  int testB();
-  int testAB();
-
-};
-
-
-int B::testB() {
-  Af classA;
-  classA.//-1-
-    ; //#1# ( "privateVar" "pubVar" )
-}
-
-int B::testAB() { // %1% ( ( "testfriends.cpp" ) ( "B" "B::testAB" ) )
-}
-
diff --git a/test/manual/cedet/tests/testjavacomp.java 
b/test/manual/cedet/tests/testjavacomp.java
deleted file mode 100644
index c32a17c..0000000
--- a/test/manual/cedet/tests/testjavacomp.java
+++ /dev/null
@@ -1,67 +0,0 @@
-//  testjavacomp.java --- Semantic unit test for Java
-
-// Copyright (C) 2009-2017 Free Software Foundation, Inc.
-
-//  Author: Eric M. Ludlam <address@hidden>
-
-//  This file is part of GNU Emacs.
-
-//  GNU Emacs is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-
-//  GNU Emacs is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-
-//  You should have received a copy of the GNU General Public License
-//  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-package tests.testjavacomp;
-
-class secondClass {
-    private void scFuncOne() {    }
-    public void scFuncOne() {    }
-}
-
-
-public class testjavacomp {
-
-    private int funcOne() {    }
-    private int funcTwo() {    }
-    private char funcThree() {    }
-
-    class nestedClass {
-       private void ncFuncOne() {      }
-       public void ncFuncOne() {       }
-    }
-
-    public void publicFunc() {
-
-       int i;
-
-       i = fu// -1-
-           // #1# ( "funcOne" "funcTwo" )
-           ;
-
-       fu// -2-
-           // #2# ( "funcOne" "funcThree" "funcTwo" )
-           ;
-
-       secondClass SC;
-
-       SC.//-3-
-           // #3# ( "scFuncOne" )
-           ;
-
-       nestedClass NC;
-
-       // @todo - need to fix this?  I don't know if  this is legal java.
-       NC.// - 4-
-           // #4# ( "ncFuncOne" )
-           ;
-    }
-
-} // testjavacomp
diff --git a/test/manual/cedet/tests/testnsp.cpp 
b/test/manual/cedet/tests/testnsp.cpp
deleted file mode 100644
index 012dc66..0000000
--- a/test/manual/cedet/tests/testnsp.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// Test NSP (Name space parent)
-//
-// Test dereferencing parents based on local parent scope.
-//
-// Derived from data David Engster provided.
-
-namespace nsp {
-
-  class rootclass {
-  public:
-    int fromroot() {};
-  };
-
-}
-
-namespace nsp {
-  class childclass : public rootclass {
-  public:
-    int fromchild() {};
-  };
-}
-
-void myfcn_not_in_ns (void) {
-  nsp::childclass test;
-
-  test.// -1-
-    ; // #1# ( "fromchild" "fromroot" )
-}
-
diff --git a/test/manual/cedet/tests/testpolymorph.cpp 
b/test/manual/cedet/tests/testpolymorph.cpp
deleted file mode 100644
index 27aa08b..0000000
--- a/test/manual/cedet/tests/testpolymorph.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/** testpolymorph.cpp --- A sequence of polymorphism examples.
- *
- * Copyright (C) 2009-2017 Free Software Foundation, Inc.
- *
- * Author: Eric M. Ludlam <address@hidden>
- *
- * This file is part of GNU Emacs.
- *
- * GNU Emacs is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * GNU Emacs is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <cmath>
-
-// Test 1 - Functions w/ prototypes
-namespace proto {
-
-  int pt_func1(int arg1);
-  int pt_func1(int arg1) {
-    return 0;
-  }
-
-}
-
-// Test 2 - Functions w/ different arg lists.
-namespace fcn_poly {
-
-  int pm_func(void) {
-    return 0;
-  }
-  int pm_func(int a) {
-    return a;
-  }
-  int pm_func(char a) {
-    return int(a);
-  }
-  int pm_func(double a) {
-    return int(floor(a));
-  }
-
-}
-
-// Test 3 - Methods w/ different arg lists.
-class meth_poly {
-public:
-  int pm_meth(void) {
-    return 0;
-  }
-  int pm_meth(int a) {
-    return a;
-  }
-  int pm_meth(char a) {
-    return int(a);
-  }
-  int pm_meth(double a) {
-    return int(floor(a));
-  }
-
-};
-
-// Test 4 - Templates w/ partial specifiers.
-namespace template_partial_spec {
-  template <typename T> class test
-  {
-  public:
-    void doSomething(T t) { };
-  };
-
-  template <typename T> class test<T *>
-  {
-  public:
-    void doSomething(T* t) { };
-  };
-}
-
-// Test 5 - Templates w/ full specialization which may or may not share
-// common functions.
-namespace template_full_spec {
-  template <typename T> class test
-  {
-  public:
-    void doSomething(T t) { };
-    void doSomethingElse(T t) { };
-  };
-
-  template <> class test<int>
-  {
-  public:
-    void doSomethingElse(int t) { };
-    void doSomethingCompletelyDifferent(int t) { };
-  };
-}
-
-// Test 6 - Dto., but for templates with multiple parameters.
-namespace template_multiple_spec {
-  template <typename T1, typename T2> class test
-  {
-  public:
-    void doSomething(T1 t) { };
-    void doSomethingElse(T2 t) { };
-  };
-
-  template <typename T2> class test<int, T2>
-  {
-  public:
-    void doSomething(int t) { };
-    void doSomethingElse(T2 t) { };
-  };
-
-  template <> class test<float, int>
-  {
-  public:
-    void doSomething(float t) { };
-    void doSomethingElse(int t) { };
-    void doNothing(void) { };
-  };
-}
-
-
-// End of polymorphism test file.
diff --git a/test/manual/cedet/tests/testspp.c 
b/test/manual/cedet/tests/testspp.c
deleted file mode 100644
index 02eab53..0000000
--- a/test/manual/cedet/tests/testspp.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* testspp.cpp --- Semantic unit test for the C preprocessor
-
-   Copyright (C) 2007-2017 Free Software Foundation, Inc.
-
-   Author: Eric M. Ludlam <address@hidden>
-
-   This file is part of GNU Emacs.
-
-   GNU Emacs is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   GNU Emacs is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-int some_fcn (){}
-
-
-#ifndef MOOSE
-int pre_show_moose(){}
-#endif
-
-#ifdef MOOSE
-int pre_dont_show_moose(){}
-#endif
-
-#if !defined(MOOSE)
-int pre_show_moose_if(){}
-#endif
-
-#if defined(MOOSE)
-int pre_dont_show_moose_if(){}
-#endif
-
-#define MOOSE
-
-#if 0
-int dont_show_function_if_0(){}
-#endif
-
-#if 1
-int show_function_if_1(){}
-#endif
-
-#ifdef MOOSE
-int moose_function(){}
-#endif
-
-#ifndef MOOSE
-int dont_show_moose(){}
-#endif
-
-#if defined(MOOSE)
-int moose_function_if(){}
-#endif
-
-#if !defined(MOOSE)
-int dont_show_moose_if() {}
-#endif
-
-#undef MOOSE
-
-#ifdef MOOSE
-int no_handy_moose(){}
-#endif
-
-#ifndef MOOSE
-int show_moose_else() {}
-#else
-int no_show_moose_else(){}
-#endif
-
-
-#ifdef MOOSE
-int no_show_moose_else_2() {}
-#else
-int show_moose_else_2() {}
-#endif
-
-#if defined(MOOSE)
-int no_show_moose_elif() {}
-#elif !defined(MOOSE)
-int show_moose_elif() {}
-#else
-int no_show_moose_elif_else() {}
-#endif
-
-#if defined(MOOSE)
-int no_show_moose_if_elif_2() {}
-#elif defined(COW)
-int no_show_moose_elif_2() {}
-#else
-int show_moose_elif_else() {}
-#endif
-
diff --git a/test/manual/cedet/tests/testsppcomplete.c 
b/test/manual/cedet/tests/testsppcomplete.c
deleted file mode 100644
index d789994..0000000
--- a/test/manual/cedet/tests/testsppcomplete.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Example provided by Hannes Janetzek */
-
-struct Test { int test; };
-
-#define BLA(_type) \
-  _type *bla = (_type*) malloc(sizeof(_type));
-
-#define BLUB(_type)                            \
-  (_type*)malloc(sizeof(_type));
-
-#define FOO(_type)                             \
-  _type *foo = BLUB(_type);
-
-#define BAR(_type)                             \
-  _type *bar = (*_type)BLUB(_type);
-
-int main(int argc, char *argv[]) {
-  BLA(Test);
-  bla->// -1-
-    ; // #1# ( "test" )
-
-  FOO(Test);
-  foo->// -2-
-    ; // #2# ( "test" )
-
-  BAR(Test);
-  bar->// -3-
-    ; // #3# ( "test" )
-}
-
diff --git a/test/manual/cedet/tests/testsppreplace.c 
b/test/manual/cedet/tests/testsppreplace.c
deleted file mode 100644
index 56ef320..0000000
--- a/test/manual/cedet/tests/testsppreplace.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* testsppreplace.c --- unit test for CPP/SPP Replacement
-   Copyright (C) 2007-2017 Free Software Foundation, Inc.
-
-   Author: Eric M. Ludlam <address@hidden>
-
-   This file is part of GNU Emacs.
-
-   GNU Emacs is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   GNU Emacs is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/* TEST: The EMU keyword doesn't screw up the function defn. */
-#define EMU
-#define EMU2 /*comment*/
-char EMU parse_around_emu EMU2 (EMU)
-{
-}
-
-/* TEST: A simple word can be replaced in a definition. */
-#define SUBFLOAT /* Some Float */ float
-SUBFLOAT returnanfloat()
-{
-}
-
-/* TEST: Punctuation an be replaced in a definition. */
-#define COLON :
-int foo COLON COLON bar ()
-{
-}
-
-/* TEST: Multiple lexical characters in a definition */
-#define SUPER mysuper::
-int SUPER baz ()
-{
-}
-
-/* TEST: Macro replacement. */
-#define INT_FCN(name) int name (int in)
-
-INT_FCN(increment) {
-  return in+1;
-}
-
-/* TEST: Macro replacement with complex args */
-#define P_(proto) ()
-
-int myFcn1 P_((a,b));
-
-#define P__(proto) proto
-
-int myFcn2 P__((int a, int b));
-int myFcn3 (int a, int b);
-
-/* TEST: Multiple args to a macro. */
-#define MULTI_ARGS(name, field1, field2, field3) struct name { int field1; int 
field2; int field3; }
-
-MULTI_ARGS(ma_struct, moose, penguin, emu);
-
-/* TEST: Macro w/ args, but no body. */
-#define NO_BODY(name)
-
-NO_BODY(Moose);
-
-/* TEST: Not a macro with args, but close. */
-#define NOT_WITH_ARGS     (moose)
-
-int not_with_args_fcn NOT_WITH_ARGS
-{
-}
-
-/* TEST: macro w/ continuation. */
-#define WITH_CONT \
-  continuation_symbol
-
-int WITH_CONT () { };
-
-/* TEST: macros in a macro - tail processing */
-#define tail_with_args_and_long_name(a) (int a)
-#define int_arg tail_with_args_and_long_name
-
-int tail int_arg(q) {}
-
-/* TEST: macros used improperly. */
-#define tail_fail tail_with_args_and_long_name(q)
-
-int tail_fcn tail_fail(q);
-
-/* TEST: feature of CPP from LSD <address@hidden> */
-#define __gthrw_(name) __gthrw_ ## name
-
-int __gthrw_(foo) (int arg1) { }
-
-/* TEST: macros using macros */
-#define macro_foo foo
-#define mf_declare int macro_foo
-
-mf_declare;
-
-/* TEST: macros with args using macros */
-#define Amacro(A) (int A)
-#define mf_Amacro(B) int B Amacro(B)
-
-mf_Amacro(noodle);
-
-/* TEST: Double macro using the argument stack. */
-#define MACRO0(name) int that_ ## name(int i);
-#define MACRO1(name) int this_ ## name(int i);
-#define MACRO2(name) MACRO0(name) MACRO1(name)
-
-MACRO2(foo)
-
-/* TEST: The G++ namespace macro hack.  Not really part of SPP. */
-_GLIBCXX_BEGIN_NAMESPACE(baz)
-
-  int bazfnc(int b) { }
-
-_GLIBCXX_END_NAMESPACE;
-
-_GLIBCXX_BEGIN_NESTED_NAMESPACE(foo,bar)
-
-  int foo_bar_func(int a) { }
-
-_GLIBCXX_END_NESTED_NAMESPACE;
-
-
-/* TEST: The VC++ macro hack. */
-_STD_BEGIN
-
-  int inside_std_namespace(int a) { }
-
-_STD_END
-
-/* TEST: Recursion prevention.  CPP doesn't allow even 1 level of recursion. */
-#define STARTMACRO MACROA
-#define MACROA MACROB
-#define MACROB MACROA
-
-int STARTMACRO () {
-
-}
-
-
-/* END */
-
diff --git a/test/manual/cedet/tests/testsppreplaced.c 
b/test/manual/cedet/tests/testsppreplaced.c
deleted file mode 100644
index 3ba90aa..0000000
--- a/test/manual/cedet/tests/testsppreplaced.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/* testsppreplaced.c --- unit test for CPP/SPP Replacement
-   Copyright (C) 2007-2017 Free Software Foundation, Inc.
-
-   Author: Eric M. Ludlam <address@hidden>
-
-   This file is part of GNU Emacs.
-
-   GNU Emacs is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   GNU Emacs is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/* What the SPP replace file would looklike with MACROS replaced: */
-
-/* TEST: The EMU keyword doesn't screw up the function defn. */
-char parse_around_emu ()
-{
-}
-
-/* TEST: A simple word can be replaced in a definition. */
-float returnanfloat()
-{
-}
-
-/* TEST: Punctuation an be replaced in a definition. */
-int foo::bar ()
-{
-}
-
-/* TEST: Multiple lexical characters in a definition */
-int mysuper::baz ()
-{
-}
-
-/* TEST: Macro replacement. */
-int increment (int in) {
-  return in+1;
-}
-
-/* TEST: Macro replacement with complex args */
-int myFcn1 ();
-
-int myFcn2 (int a, int b);
-int myFcn3 (int a, int b);
-
-/* TEST: Multiple args to a macro. */
-struct ma_struct { int moose; int penguin; int emu; };
-
-/* TEST: Macro w/ args, but no body. */
-
-/* TEST: Not a macro with args, but close. */
-int not_with_args_fcn (moose)
-{
-}
-
-/* TEST: macro w/ continuation. */
-int continuation_symbol () { };
-
-/* TEST: macros in a macro - tail processing */
-
-int tail (int q) {}
-
-/* TEST: macros used improperly */
-
-int tail_fcn(int q);
-
-/* TEST: feature of CPP from LSD <address@hidden> */
-
-int __gthrw_foo (int arg1) { }
-
-/* TEST: macros using macros */
-int foo;
-
-/* TEST: macros with args using macros */
-int noodle(int noodle);
-
-/* TEST: Double macro using the argument stack. */
-int that_foo(int i);
-int this_foo(int i);
-
-/* TEST: The G++ namespace macro hack.  Not really part of SPP. */
-namespace baz {
-
-  int bazfnc(int b) { }
-
-}
-
-namespace foo { namespace bar {
-
-    int foo_bar_func(int a) { }
-
-  }
-}
-
-/* TEST: The VC++ macro hack. */
-namespace std {
-
-  int inside_std_namespace(int a) { }
-
-}
-
-/* TEST: Recursion prevention.  CPP doesn't allow even 1 level of recursion. */
-int MACROA () {
-
-}
-
-
-/* End */
diff --git a/test/manual/cedet/tests/testsubclass.cpp 
b/test/manual/cedet/tests/testsubclass.cpp
deleted file mode 100644
index e74ca43..0000000
--- a/test/manual/cedet/tests/testsubclass.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-// testsubclass.cpp --- unit test for analyzer and complex C++ inheritance
-
-// Copyright (C) 2007-2017 Free Software Foundation, Inc.
-
-// Author: Eric M. Ludlam <address@hidden>
-
-// This file is part of GNU Emacs.
-
-// GNU Emacs is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// GNU Emacs is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-//#include <iostream>
-#include "testsubclass.hh"
-
-void animal::moose::setFeet(int numfeet) //^1^
-{
-  if (numfeet > 4) {
-    std::cerr << "Why would a moose have more than 4 feet?" << std::endl;
-    return;
-  }
-
-  fFeet = numfeet;
-}
-
-int animal::moose::getFeet() //^2^
-{
-  return fFeet;
-}
-
-void animal::moose::doNothing() //^3^
-{
-  animal::moose foo();
-
-  fFeet = N// -15-
-    ; // #15# ( "NAME1" "NAME2" "NAME3" )
-}
-
-
-void deer::moose::setAntlers(bool have_antlers) //^4^
-{
-  fAntlers = have_antlers;
-}
-
-bool deer::moose::getAntlers() //^5^
-// %1% ( ( "testsubclass.cpp" "testsubclass.hh" ) ( "deer::moose::doSomething" 
"deer::moose::getAntlers" "moose" ) )
-{
-  return fAntlers;
-}
-
-bool i_dont_have_symrefs()
-// %2% ( ("testsubclass.cpp" ) ("i_dont_have_symrefs"))
-{
-}
-
-void deer::moose::doSomething() //^6^
-{
-  // All these functions should be identified by semantic analyzer.
-  getAntlers();
-  setAntlers(true);
-
-  getFeet();
-  setFeet(true);
-
-  doNothing();
-
-  fSomeField = true;
-
-  fIsValid = true;
-}
-
-void deer::alces::setLatin(bool l) {
-  fLatin = l;
-}
-
-bool deer::alces::getLatin() {
-  return fLatin;
-}
-
-void deer::alces::doLatinStuff(moose moosein) {
-  // All these functions should be identified by semantic analyzer.
-  getFeet();
-  setFeet(true);
-
-  getLatin();
-  setLatin(true);
-
-  doNothing();
-
-  deer::moose foo();
-
-
-}
-
-moose deer::alces::createMoose()
-{
-  moose MooseVariableName;
-  bool tmp;
-  int itmp;
-  bool fool;
-  int fast;
-
-  MooseVariableName = createMoose();
-
-  doLatinStuff(MooseVariableName);
-
-  tmp = this.f// -1-
-    // #1# ( "fAlcesBool" "fIsValid" "fLatin" )
-    ;
-
-  itmp = this.f// -2-
-    // #2# ( "fAlcesInt" "fGreek" "fIsProtectedInt" )
-    ;
-
-  tmp = f// -3-
-    // #3# ( "fAlcesBool" "fIsValid" "fLatin" "fool" )
-    ;
-
-  itmp = f// -4-
-    // #4# ( "fAlcesInt" "fGreek" "fIsProtectedInt" "fast" )
-    ;
-
-  MooseVariableName = m// -5-
-    // #5# ( "moose" )
-
-  return MooseVariableName;
-}
-
-/** Test Scope Changes
- *
- * This function is rigged to make sure the scope changes to account
- * for different locations in local variable parsing.
- */
-int someFunction(int mPickle)
-{
-  moose mMoose = deer::alces::createMoose();
-
-  if (mPickle == 1) {
-
-    int mOption1 = 2;
-
-    m// -5-
-      // #5# ( "mMoose" "mOption1" "mPickle" )
-      ;
-
-  } else {
-
-    int mOption2 = 2;
-
-    m// -6-
-      // #6# ( "mMoose" "mOption2" "mPickle" )
-      ;
-  }
-
-}
-
-// Thanks Ming-Wei Chang for this next example.
-
-namespace pub_priv {
-
-  class A{
-  private:
-    void private_a(){}
-  public:
-    void public_a();
-  };
-
-  void A::public_a() {
-    A other_a;
-
-    other_a.p// -7-
-      // #7# ( "private_a" "public_a" )
-      ;
-  }
-
-  int some_regular_function(){
-    A a;
-    a.p// -8-
-      // #8# ( "public_a" )
-      ;
-    return 0;
-  }
-
-}
-
-
-/** Test Scope w/in a function (non-method) with classes using
- * different levels of inheritance.
- */
-int otherFunction()
-{
-  sneaky::antelope Antelope(1);
-  sneaky::jackalope Jackalope(1);
-  sneaky::bugalope Bugalope(1);
-
-  Antelope.// -9-
-    // #9# ( "fAntyPublic" "fQuadPublic" "testAccess")
-    ;
-
-  Jackalope.// -10-
-    // #10# ( "fBunnyPublic" "testAccess")
-    ;
-
-  Jackalope// @1@ 6
-    ;
-  Jackalope;
-  Jackalope;
-  Jackalope;
-
-  Bugalope.// -11-
-    // #11# ( "fBugPublic" "testAccess")
-    ;
-  Bugalope// @2@ 3
-    ;
-}
-
-/** Test methods within each class for types of access to the baseclass.
- */
-
-bool sneaky::antelope::testAccess() //^7^
-{
-  this.// -12-
-    // #12# ( "fAntyPrivate" "fAntyProtected" "fAntyPublic" "fQuadProtected" 
"fQuadPublic" "testAccess" )
-    ;
-}
-
-bool sneaky::jackalope::testAccess() //^8^
-{
-  this.// -13-
-    // #13# ( "fBunnyPrivate" "fBunnyProtected" "fBunnyPublic" 
"fQuadProtected" "fQuadPublic" "testAccess" )
-    ;
-}
-
-bool sneaky::bugalope::testAccess() //^9^
-{
-  this.// -14-
-    // #14# ( "fBugPrivate" "fBugProtected" "fBugPublic" "fQuadPublic" 
"testAccess" )
-    ;
-}
-
diff --git a/test/manual/cedet/tests/testsubclass.hh 
b/test/manual/cedet/tests/testsubclass.hh
deleted file mode 100644
index 6f199c2..0000000
--- a/test/manual/cedet/tests/testsubclass.hh
+++ /dev/null
@@ -1,191 +0,0 @@
-// testsubclass.hh --- unit test for analyzer and complex C++ inheritance
-
-// Copyright (C) 2007-2017 Free Software Foundation, Inc.
-
-// Author: Eric M. Ludlam <address@hidden>
-
-// This file is part of GNU Emacs.
-
-// GNU Emacs is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// GNU Emacs is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-//#include <cmath>
-// #include <stdio.h>
-
-#ifndef TESTSUBCLASS_HH
-#define TESTSUBCLASS_HH
-
-namespace animal {
-
-  class moose {
-  public:
-    moose() : fFeet(0),
-             fIsValid(false)
-    { }
-
-    virtual void setFeet(int);
-    int getFeet();
-
-    void doNothing();
-
-    enum moose_enum {
-      NAME1, NAME2, NAME3 };
-      
-
-  protected:
-
-    bool fIsValid;
-    int fIsProtectedInt;
-
-  private:
-    int fFeet; // Usually 2 or 4.
-    bool fIsPrivateBool;
-    
-  }; // moose
-
-  int two_prototypes();
-  int two_prototypes();
-
-  class quadruped {
-  public:
-    quadruped(int a) : fQuadPrivate(a)
-    { }
-
-    int fQuadPublic;
-
-  protected:
-    int fQuadProtected;
-
-  private:
-    int fQuadPrivate;
-
-  };
-
-}
-
-
-namespace deer {
-
-  class moose : public animal::moose {
-  public:
-    moose() : fAntlers(false)
-    { }
-
-    void setAntlers(bool);
-    bool getAntlers();
-
-    void doSomething();
-
-  protected:
-
-    bool fSomeField;
-
-  private:
-    bool fAntlers;
-
-  };
-
-} // deer
-
-// A second namespace of the same name will test the
-// namespace merging needed to resolve deer::alces
-namespace deer {
-
-  class alces : public animal::moose {
-  public:
-    alces(int lat) : fLatin(lat)
-    { }
-
-    void setLatin(bool);
-    bool getLatin();
-
-    void doLatinStuff(moose moosein); // for completion testing
-
-    moose createMoose(); // for completion testing.
-
-  protected:
-    bool fAlcesBool;
-    int fAlcesInt;
-
-  private:
-    bool fLatin;
-    int fGreek;
-  };
-
-};
-
-// A third namespace with classes that does protected and private inheritance.
-namespace sneaky {
-
-  class antelope : public animal::quadruped {
-
-  public:
-    antelope(int a) : animal::quadruped(),
-                     fAntyProtected(a)
-    {}
-
-    int fAntyPublic;
-
-    bool testAccess();
-
-  protected:
-    int fAntyProtected;
-
-  private :
-    int fAntyPrivate;
-
-  };
-
-  class jackalope : protected animal::quadruped {
-
-  public:
-    jackalope(int a) : animal::quadruped(),
-                      fBunny(a)
-    {}
-
-    int fBunnyPublic;
-
-    bool testAccess();
-
-  protected:
-    bool fBunnyProtected;
-
-  private :
-    bool fBunnyPrivate;
-
-  };
-
-  // Nothing specified means private.
-  class bugalope : /* private*/  animal::quadruped {
-
-  public:
-    bugalope(int a) : animal::quadruped(),
-                      fBug(a)
-    {}
-
-    int fBugPublic;
-
-    bool testAccess();
-  protected:
-    bool fBugProtected;
-
-  private :
-    bool fBugPrivate;
-
-  };
-
-
-};
-
-#endif
-
diff --git a/test/manual/cedet/tests/testtypedefs.cpp 
b/test/manual/cedet/tests/testtypedefs.cpp
deleted file mode 100644
index e6c91f7..0000000
--- a/test/manual/cedet/tests/testtypedefs.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-// testtypedefs.cpp --- Sample with some fake bits out of std::string
-
-// Copyright (C) 2008-2017 Free Software Foundation, Inc.
-
-// Author: Eric M. Ludlam <address@hidden>
-
-// This file is part of GNU Emacs.
-
-// GNU Emacs is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// GNU Emacs is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-// Thanks Ming-Wei Chang for these examples.
-
-namespace std {
-  template <T>class basic_string {
-  public:
-    void resize(int);
-  };
-}
-
-typedef std::basic_string<char> mstring;
-
-using namespace std;
-typedef basic_string<char> bstring;
-
-int main(){
-  mstring a;
-  a.// -1-
-    ;
-  // #1# ( "resize" )
-  bstring b;
-  // It doesn't work here.
-  b.// -2-
-    ;
-  // #2# ( "resize" )
-  return 0;
-}
-
-// ------------------
-
-class Bar
-{
-public:
-     void someFunc() {}
-};
-
-typedef Bar new_Bar;
-
-template <class mytype>
-class TBar
-{
-public:
-     void otherFunc() {}
-};
-
-typedef TBar<char> new_TBar;
-
-int main()
-{
-  new_Bar nb;
-  new_TBar ntb;
-
-  nb.// -3-
-    ;
-  // #3# ("someFunc")
-  ntb.// -4-
-    ;
-  // #4# ("otherFunc")
-  return 0;
-}
-
diff --git a/test/manual/cedet/tests/testvarnames.c 
b/test/manual/cedet/tests/testvarnames.c
deleted file mode 100644
index dbc4afb..0000000
--- a/test/manual/cedet/tests/testvarnames.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* testvarnames.cpp
-   Test variable and function names, lists of variables on one line, etc.
-
-   Copyright (C) 2008-2017 Free Software Foundation, Inc.
-
-   Author: Eric M. Ludlam <address@hidden>
-
-   This file is part of GNU Emacs.
-
-   GNU Emacs is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   GNU Emacs is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-struct independent {
-  int indep_1;
-  int indep_2;
-};
-
-struct independent var_indep_struct;
-
-struct {
-  int unnamed_1;
-  int unnamed_2;
-} var_unnamed_struct;
-
-struct {
-  int unnamed_3;
-  int unnamed_4;
-} var_un_2, var_un_3;
-
-struct inlinestruct {
-  int named_1;
-  int named_2;
-} var_named_struct;
-
-struct inline2struct {
-  int named_3;
-  int named_4;
-} var_n_2, var_n_3;
-
-/* Structures with names that then declare variables
- * should also be completable.
- *
- * Getting this to work is the bugfix in semantic-c.el CVS v 1.122
- */
-struct inlinestruct in_var1;
-struct inline2struct in_var2;
-
-int test_1(int var_arg1) {
-
-  var_// -1-
-    ; // #1# ("var_arg1" "var_indep_struct" "var_n_2" "var_n_3" 
"var_named_struct" "var_un_2" "var_un_3" "var_unnamed_struct")
-
-  var_indep_struct.// -2-
-    ; // #2# ( "indep_1" "indep_2" )
-
-  var_unnamed_struct.// -3-
-    ; // #3# ( "unnamed_1" "unnamed_2" )
-
-  var_named_struct.// -4-
-    ; // #4# ( "named_1" "named_2" )
-
-  var_un_2.// -5-
-    ; // #5# ( "unnamed_3" "unnamed_4" )
-  var_un_3.// -6-
-    ; // #6# ( "unnamed_3" "unnamed_4" )
-
-  var_n_2.// -7-
-    ; // #7# ( "named_3" "named_4" )
-  var_n_3.// -8-
-    ; // #8# ( "named_3" "named_4" )
-
-  in_// -9-
-    ; // #9# ( "in_var1" "in_var2" )
-
-  in_var1.// -10-
-    ; // #10# ( "named_1" "named_2")
-  in_var2.// -11-
-    ; // #11# ( "named_3" "named_4")
-}



reply via email to

[Prev in Thread] Current Thread [Next in Thread]