Remove callback function from autodoc unit test.

It doesn't seem to belong there at all, there is a dedicated callback unit
test for it and it was added to the initial version of autodoc.i back in
124253d69828b4323f939bf118254ee96aefcdc7 without any explanation, so just
remove it.

As this callback was used in a PHP test, perform this test for callback.i now
and use "%(uppercase)s" construct inside %callback to test that this works.

4 files changed, 10 insertions, 16 deletions

diff --git a/Examples/test-suite/autodoc.i b/Examples/test-suite/autodoc.i
index d85899756..07afa5794 100644
--- a/Examples/test-suite/autodoc.i
+++ b/Examples/test-suite/autodoc.i
@@ -114,12 +114,6 @@
   }
 %}
 
-%callback("%(uppercase)s_CALLBACK") func_cb;
-
-%inline {
-  int func_cb(int c, int d) { return c; }
-}
-
 // Bug 3310528
 %feature("autodoc","1") banana; // names + types
 %inline %{
diff --git a/Examples/test-suite/callback.i b/Examples/test-suite/callback.i
index c92994898..4db63353b 100644
--- a/Examples/test-suite/callback.i
+++ b/Examples/test-suite/callback.i
@@ -12,7 +12,7 @@
 %callback("%s") A::bar;
 %callback("%s") A::foom;
 #endif
-%callback("%s_Cb_Ptr") foo_T;  // this works in Python too
+%callback("%(uppercase)s_Cb_Ptr") foo_T;  // this works in Python too
 
 %inline %{
 
diff --git a/Examples/test-suite/php/autodoc_runme.php b/Examples/test-suite/php/autodoc_runme.php
deleted file mode 100644
index f2e19d3cb..000000000
--- a/Examples/test-suite/php/autodoc_runme.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-require "tests.php";
-require "autodoc.php";
-// In 2.0.6 and earlier, the constant was misnamed.
-if (gettype(autodoc::FUNC_CB_CALLBACK) !== 'resource') die("autodoc::FUNC_CB_CALLBACK not a resource\n");
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/callback_runme.php b/Examples/test-suite/php/callback_runme.php
new file mode 100644
index 000000000..392d5e598
--- /dev/null
+++ b/Examples/test-suite/php/callback_runme.php
@@ -0,0 +1,9 @@
+<?php
+
+require "tests.php";
+require "callback.php";
+// In 2.0.6 and earlier, the constant was misnamed.
+if (gettype(callback::FOO_I_Cb_Ptr) !== 'resource') die("callback::foo_T<int> not a resource\n");
+
+check::done();
+?>