Fix etags test suite messed up by merges from emacs-25

* test/manual/etags/go-src/test.go:
* test/manual/etags/go-src/test1.go: Move from test/etags/.
* test/manual/etags/ruby-src/test1.ru: Replace test1.ruby.
* test/etags/: Directory deleted.

diff --git a/test/etags/go-src/test.go b/test/etags/go-src/test.go
deleted file mode 100644 (file)
index 6aea26e..0000000
--- a/test/etags/go-src/test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package main
-
-import "fmt"
-
-func say(msg string) {
-       fmt.Println(msg)
-}
-
-func main() {
-       say("Hello, Emacs!")
-}

diff --git a/test/etags/go-src/test1.go b/test/etags/go-src/test1.go
deleted file mode 100644 (file)
index 6d1efaa..0000000
--- a/test/etags/go-src/test1.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package main
-
-import "fmt"
-
-type plus interface {
-       PrintAdd()
-}
-
-type str struct {
-       a, b string
-}
-
-type intNumber struct {
-       a, b int
-}
-
-func (s str) PrintAdd() {
-       fmt.Println(s.a + s.b)
-}
-
-func (n intNumber) PrintAdd() {
-       fmt.Println(n.a + n.b)
-}
-
-func test(p plus) {
-       p.PrintAdd()
-}
-
-func main() {
-       s := str{a: "Hello,", b: "Emacs!"}
-       number := intNumber{a: 1, b: 2}
-       test(number)
-       test(s)
-}

diff --git a/test/etags/ruby-src/test1.ru b/test/etags/ruby-src/test1.ru
deleted file mode 100644 (file)
index eafaec6..0000000
--- a/test/etags/ruby-src/test1.ru
+++ /dev/null
@@ -1,45 +0,0 @@
-class A
- def a()
-  super(" do ")
- end
- def b()
- end
-end
-
-module A
-  class B
-    ABC = 4
-    Def_ = 'blah'
-    Xyzzy =10
-
-    def foo!
-    end
-
-    def self._bar?(abc)
-    end
-
-    class << self
-      def qux=(tee)
-      end
-    end
-
-    attr_reader :foo
-    attr_reader :read1 , :read2; attr_writer :write1, :write2
-    attr_writer :bar,
-                :baz,
-                :more
-    attr_accessor :tee
-    alias_method :qux, :tee, attr_accessor(:bogus)
-    alias_method :xyz,
-                 :tee ; attr_reader :subtle
-    attr_reader(:foo1, :bar1, # comment
-                :qux1)
-    alias_method ( :foo2, #cmmt
-                   :bar2)
-  end
-end
-
-A::Constant = 5
-
-# def foo_in_comment
-# end

diff --git a/test/manual/etags/go-src/test.go b/test/manual/etags/go-src/test.go
new file mode 100644 (file)
index 0000000..6aea26e
--- /dev/null
+++ b/test/manual/etags/go-src/test.go
@@ -0,0 +1,11 @@
+package main
+
+import "fmt"
+
+func say(msg string) {
+       fmt.Println(msg)
+}
+
+func main() {
+       say("Hello, Emacs!")
+}

diff --git a/test/manual/etags/go-src/test1.go b/test/manual/etags/go-src/test1.go
new file mode 100644 (file)
index 0000000..6d1efaa
--- /dev/null
+++ b/test/manual/etags/go-src/test1.go
@@ -0,0 +1,34 @@
+package main
+
+import "fmt"
+
+type plus interface {
+       PrintAdd()
+}
+
+type str struct {
+       a, b string
+}
+
+type intNumber struct {
+       a, b int
+}
+
+func (s str) PrintAdd() {
+       fmt.Println(s.a + s.b)
+}
+
+func (n intNumber) PrintAdd() {
+       fmt.Println(n.a + n.b)
+}
+
+func test(p plus) {
+       p.PrintAdd()
+}
+
+func main() {
+       s := str{a: "Hello,", b: "Emacs!"}
+       number := intNumber{a: 1, b: 2}
+       test(number)
+       test(s)
+}

diff --git a/test/manual/etags/ruby-src/test1.ru b/test/manual/etags/ruby-src/test1.ru
new file mode 100644 (file)
index 0000000..eafaec6
--- /dev/null
+++ b/test/manual/etags/ruby-src/test1.ru
@@ -0,0 +1,45 @@
+class A
+ def a()
+  super(" do ")
+ end
+ def b()
+ end
+end
+
+module A
+  class B
+    ABC = 4
+    Def_ = 'blah'
+    Xyzzy =10
+
+    def foo!
+    end
+
+    def self._bar?(abc)
+    end
+
+    class << self
+      def qux=(tee)
+      end
+    end
+
+    attr_reader :foo
+    attr_reader :read1 , :read2; attr_writer :write1, :write2
+    attr_writer :bar,
+                :baz,
+                :more
+    attr_accessor :tee
+    alias_method :qux, :tee, attr_accessor(:bogus)
+    alias_method :xyz,
+                 :tee ; attr_reader :subtle
+    attr_reader(:foo1, :bar1, # comment
+                :qux1)
+    alias_method ( :foo2, #cmmt
+                   :bar2)
+  end
+end
+
+A::Constant = 5
+
+# def foo_in_comment
+# end

diff --git a/test/manual/etags/ruby-src/test1.ruby b/test/manual/etags/ruby-src/test1.ruby
deleted file mode 100644 (file)
index 26b7d53..0000000
--- a/test/manual/etags/ruby-src/test1.ruby
+++ /dev/null
@@ -1,29 +0,0 @@
-class A
- def a()
-  super(" do ")
- end
- def b()
- end
-end
-
-module A
-  class B
-    ABC = 4
-
-    def foo!
-    end
-
-    def self._bar?(abc)
-    end
-
-    class << self
-      def qux=(tee)
-      end
-    end
-  end
-end
-
-A::Constant = 5
-
-# def foo_in_comment
-# end