diff options
| author | Joakim Verona | 2011-11-22 15:39:42 +0100 |
|---|---|---|
| committer | Joakim Verona | 2011-11-22 15:39:42 +0100 |
| commit | 40bb789236e486a3f36eefb2840c293369ce2af3 (patch) | |
| tree | 8e81d3aa5f232ec7f2c5187c683cb0998d2dc4e2 /test/cedet | |
| parent | 62318aed495a48e24ff73fe79e420dd801df3189 (diff) | |
| parent | a8e1496d750ab0f571b3412ff61aaa4da640a036 (diff) | |
| download | emacs-40bb789236e486a3f36eefb2840c293369ce2af3.tar.gz emacs-40bb789236e486a3f36eefb2840c293369ce2af3.zip | |
upstream
Diffstat (limited to 'test/cedet')
| -rw-r--r-- | test/cedet/semantic-tests.el | 3 | ||||
| -rw-r--r-- | test/cedet/semantic-utest.el | 4 | ||||
| -rw-r--r-- | test/cedet/srecode-tests.el | 2 | ||||
| -rw-r--r-- | test/cedet/tests/testpolymorph.cpp | 3 |
4 files changed, 5 insertions, 7 deletions
diff --git a/test/cedet/semantic-tests.el b/test/cedet/semantic-tests.el index c840993bf24..16dcd42c2ae 100644 --- a/test/cedet/semantic-tests.el +++ b/test/cedet/semantic-tests.el | |||
| @@ -54,7 +54,7 @@ All systems are different. Ask questions along the way." | |||
| 54 | (y-or-n-p "New database created. Reload system databases? ") | 54 | (y-or-n-p "New database created. Reload system databases? ") |
| 55 | (y-or-n-p "Load in all system databases? ")) | 55 | (y-or-n-p "Load in all system databases? ")) |
| 56 | (semanticdb-load-ebrowse-caches))) | 56 | (semanticdb-load-ebrowse-caches))) |
| 57 | ;; Ok, databases were creatd. Lets try some searching. | 57 | ;; Ok, databases were created. Let's try some searching. |
| 58 | (when (not (or (eq major-mode 'c-mode) | 58 | (when (not (or (eq major-mode 'c-mode) |
| 59 | (eq major-mode 'c++-mode))) | 59 | (eq major-mode 'c++-mode))) |
| 60 | (error "Please make your default buffer be a C or C++ file, then | 60 | (error "Please make your default buffer be a C or C++ file, then |
| @@ -387,4 +387,3 @@ gcc version 2.95.2 19991024 (release)" | |||
| 387 | (let ((semantic-gcc-test-strings (list (semantic-gcc-query "gcc" "-v")))) | 387 | (let ((semantic-gcc-test-strings (list (semantic-gcc-query "gcc" "-v")))) |
| 388 | (semantic-gcc-test-output-parser)) | 388 | (semantic-gcc-test-output-parser)) |
| 389 | ) | 389 | ) |
| 390 | |||
diff --git a/test/cedet/semantic-utest.el b/test/cedet/semantic-utest.el index a9a7c765f2b..db737b60c6f 100644 --- a/test/cedet/semantic-utest.el +++ b/test/cedet/semantic-utest.el | |||
| @@ -787,7 +787,7 @@ SKIPNAMES is a list of names to remove from NAME-CONTENTS" | |||
| 787 | (defun semantic-utest-kill-indicator ( killme insertme) | 787 | (defun semantic-utest-kill-indicator ( killme insertme) |
| 788 | "Kill the line with KILLME on it and insert INSERTME in its place." | 788 | "Kill the line with KILLME on it and insert INSERTME in its place." |
| 789 | (goto-char (point-min)) | 789 | (goto-char (point-min)) |
| 790 | ; (re-search-forward (concat "/\\*" indicator "\\*/")); JAVE this isnt generic enough for different lagnuages | 790 | ; (re-search-forward (concat "/\\*" indicator "\\*/")); JAVE this isn't generic enough for different languages |
| 791 | (re-search-forward killme) | 791 | (re-search-forward killme) |
| 792 | (beginning-of-line) | 792 | (beginning-of-line) |
| 793 | (setq semantic-utest-last-kill-pos (point)) | 793 | (setq semantic-utest-last-kill-pos (point)) |
| @@ -812,7 +812,7 @@ SKIPNAMES is a list of names to remove from NAME-CONTENTS" | |||
| 812 | (defun semantic-utest-last-invalid (name-contents names-removed killme insertme) | 812 | (defun semantic-utest-last-invalid (name-contents names-removed killme insertme) |
| 813 | "Make the last fcn invalid." | 813 | "Make the last fcn invalid." |
| 814 | (semantic-utest-kill-indicator killme insertme) | 814 | (semantic-utest-kill-indicator killme insertme) |
| 815 | ; (semantic-utest-verify-names name-contents names-removed); verify its gone ;new validator doesnt handle skipnames yet | 815 | ; (semantic-utest-verify-names name-contents names-removed); verify its gone ;new validator doesn't handle skipnames yet |
| 816 | (semantic-utest-unkill-indicator);put back killed stuff | 816 | (semantic-utest-unkill-indicator);put back killed stuff |
| 817 | ) | 817 | ) |
| 818 | 818 | ||
diff --git a/test/cedet/srecode-tests.el b/test/cedet/srecode-tests.el index 10b06f5cd01..a1b8f60b2ec 100644 --- a/test/cedet/srecode-tests.el +++ b/test/cedet/srecode-tests.el | |||
| @@ -177,7 +177,7 @@ It is filled with some text." | |||
| 177 | 177 | ||
| 178 | (mapc (lambda (T) | 178 | (mapc (lambda (T) |
| 179 | (when (slot-boundp T 'overlay) | 179 | (when (slot-boundp T 'overlay) |
| 180 | (error "Overlay did not clear off of of field %s" | 180 | (error "Overlay did not clear off of field %s" |
| 181 | (object-name T)))) | 181 | (object-name T)))) |
| 182 | fields) | 182 | fields) |
| 183 | 183 | ||
diff --git a/test/cedet/tests/testpolymorph.cpp b/test/cedet/tests/testpolymorph.cpp index 493b4344c17..9db2d51efe7 100644 --- a/test/cedet/tests/testpolymorph.cpp +++ b/test/cedet/tests/testpolymorph.cpp | |||
| @@ -50,7 +50,7 @@ namespace fcn_poly { | |||
| 50 | 50 | ||
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | // Test 3 - Methods w/ differet arg lists. | 53 | // Test 3 - Methods w/ different arg lists. |
| 54 | class meth_poly { | 54 | class meth_poly { |
| 55 | public: | 55 | public: |
| 56 | int pm_meth(void) { | 56 | int pm_meth(void) { |
| @@ -128,4 +128,3 @@ namespace template_multiple_spec { | |||
| 128 | 128 | ||
| 129 | 129 | ||
| 130 | // End of polymorphism test file. | 130 | // End of polymorphism test file. |
| 131 | |||