~ubuntu-elisp/emacs/+git/master:scratch/merge-cedet-tests

Last commit made on 2017-01-28
Get this branch:
git clone -b scratch/merge-cedet-tests https://git.launchpad.net/~ubuntu-elisp/emacs/+git/master

Branch merges

Branch information

Name:
scratch/merge-cedet-tests
Repository:
lp:~ubuntu-elisp/emacs/+git/master

Recent commits

b6e8248... by Edward John Steere <email address hidden>

Fix ia-utest, add missing includes and add missing test resources

Some more stragglers which were missed during the merge along with
fixes which allow the tests to run.
* test/manual/cedet/cedet-utests.el: (semantic/fw) new
  require. (semantic/wisent/calc) deleted
  require. (cedet-utest-test-alist) removed compdb
  test.
* test/manual/cedet/cedet/ede/detect-utest.el:
  (ede-detect-linux-utest) added function from CEDET.
* test/manual/cedet/cedet/semantic/ia-utest.el:
  (semantic-ia-utest-buffer) Fixed setq form for regex-p and regex-a
  which were accidentally broken during merging.
* test/manual/cedet/cedet/ede/src/proj/Project.ede:
* test/manual/cedet/cedet/ede/src/proj/TEST:
* test/manual/cedet/cedet/ede/src/proj/sub/Project.ede:
* test/manual/cedet/cedet/semantic/tests/test-fmt.el: Added missing
  test resources from CEDET

3cc63e2... by Edward John Steere <email 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/manual/cedet/cedet/ede/detect-utest.el:
  (ede-detect-utest-project-entries) removed ant test
* test/manual/cedet/cedet/ede/src/cpproot/README:
* test/manual/cedet/cedet/ede/src/cpproot/src/main.cpp: Added test resources
* test/manual/cedet/cedet/semantic/ia-utest.el:
  (semantic-ia-utest-buffer-refs) Fixed syntax error accidentally
  introduced by merge.
* test/manual/cedet/cedet/semantic/utest-parse.el:
  (semantic-utest-Java-buffer-contents,
  semantic-utest-Java-name-contents): deleted java tests

ec14f1c... by xscript <email address hidden>

Move tests in cedet/semantic

0041d52... by Eric Ludlam <email address hidden>

Add header comments and provide.

8989dc6... by Eric Ludlam <email address hidden>

New Tests for ede-java-root-project type.

ce2952b... by David Engster <email 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.

f8e3bbc... by David Engster <email 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.

02c7dbb... by xscript <email address hidden>

Move tests in cedet/semantic

760fef4... by xscript <email address hidden>

Fix typo

* test/manual/cedet/cedet/semantic/idle.el: Fix typo due to automated
 file rename ('semantic.elapsed-time' -> 'semantic-elapsed-time).

9767368... by xscript <email address hidden>

Synchronize cedet/semantic with Emacs.