-dnl Copyright © 2019 Nick Bowler
+dnl Copyright © 2019-2021 Nick Bowler
dnl License GPLv2+: GNU General Public License version 2 or any later version.
dnl This is free software: you are free to change and redistribute it.
dnl There is NO WARRANTY, to the extent permitted by law.
AT_SETUP([str.gob])
AT_DATA([main.c],
-[[#include "str.h"
+[[#include <config.h>
+#include "str.h"
int main(void)
{
str_gob=$abs_top_srcdir/t/str.gob
AT_CHECK([gob2 "$str_gob"])
+AT_CHECK([$HAVE_GOBJECT_PRIVATES || exit 77])
TEST_COMPILE_GOBJECT([str.c], [0], [], [stderr])
mv stderr str_stderr
AT_CHECK([test x"$total" = x"2"])
TEST_COMPILE_GOBJECT([main.c], [0], [], [stderr])
-AT_CHECK([awk -NF : '$1 == "main.c" && $2 == "15" { exit 42 }' stderr], [42])
+AT_CHECK([awk -NF : '$1 == "main.c" && $2 == "16" { exit 42 }' stderr], [42])
AT_CHECK([$CC $CFLAGS $LDFLAGS $LIBGOBJECT_LIBS -o main str.o main.o])
AT_SETUP([dynamic types])
AT_KEYWORDS([dynamic])
-AT_DATA([test.gob],
-[[class :Test from G:Object (dynamic)
+AT_DATA([test.gob], [[%ctop{
+#include <config.h>
+%}
+class :Test from G:Object (dynamic)
{
public void test(void)
{
}
]])
AT_CHECK([gob2 test.gob])
+TEST_COMPILE_GOBJECT([test.c], [0], [], [ignore])
AT_DATA([main.c],
-[[#include "test.h"
+[[#include <config.h>
+#include "test.h"
int main(void)
{
test_register_type(NULL);
}
]])
-
-TEST_COMPILE_GOBJECT([test.c], [0], [], [ignore])
TEST_COMPILE_GOBJECT([main.c], [0], [], [ignore])
+
AT_CHECK([$CC $CFLAGS $LDFLAGS $LIBGOBJECT_LIBS -o main test.o main.o])
AT_CLEANUP
AT_SETUP([dynamic type registration])
AT_KEYWORDS([dynamic runtime])
-AT_DATA([test.gob],
-[[%{
+AT_DATA([test.gob], [[%ctop{
+#include <config.h>
+%}
+%{
#include <stdio.h>
%}
class :Test from G:Object (dynamic)
}
}
]])
+AT_CHECK([gob2 test.gob])
+TEST_COMPILE_GOBJECT([test.c], [0], [], [ignore])
-AT_DATA([mod.gob],
-[[%{
-#include "test.h"
-%}
-class :Mod from G:Type:Module
-{
- override (G:Type:Module) gboolean load(G:Type:Module *m)
- {
- test_register_type(m);
- return TRUE;
- }
-}
-]])
+TEST_TYPE_MODULE([:Test])
AT_DATA([main.c],
-[[#include <stdio.h>
-#include "mod.h"
+[[#include <stdlib.h>
#include "test.h"
+#include "test-mod.h"
void devnull(const char *a, GLogLevelFlags b, const char *c, gpointer d) { }
int main(void)
{
- GTypeModule *m = g_object_new(mod_get_type(), NULL);
guint handler;
Test *t;
return EXIT_FAILURE;
g_log_remove_handler("GLib-GObject", handler);
- g_type_module_use(m);
+ /* Register dynamic type */
+ g_type_module_use(g_object_new(test_mod_get_type(), NULL));
+
/* should work now */
t = g_object_new(test_get_type(), "s", "Hello, World", (char *)NULL);
if (!t)
return EXIT_SUCCESS;
}
]])
-
-AT_CHECK([gob2 mod.gob])
-AT_CHECK([gob2 test.gob])
-TEST_COMPILE_GOBJECT([mod.c], [0], [], [ignore])
-TEST_COMPILE_GOBJECT([test.c], [0], [], [ignore])
TEST_COMPILE_GOBJECT([main.c], [0], [], [ignore])
-AT_CHECK([$CC $CFLAGS $LDFLAGS $LIBGOBJECT_LIBS -o main mod.o test.o main.o])
+
+AT_CHECK([$CC $CFLAGS $LDFLAGS $LIBGOBJECT_LIBS -o main \
+ test.o test-mod.o main.o])
AT_CHECK([./main], [0], [Hello, World
])
AT_CLEANUP
-dnl Dynamic types: check that we can call interface methods of dynamic types.
-AT_SETUP([dynamic interface implementation])
-AT_KEYWORDS([dynamic runtime interface])
+AT_SETUP([GOB2_CHECK min-version test])
-AT_DATA([iface.h],
-[[#define IF_TYPE_TEST if_test_get_type()
+AT_DATA([configure.ac],
+[[AC_PREREQ([2.62])
+AC_INIT([test], [0])
+AC_OUTPUT
+]])
+AT_CHECK([$AUTOCONF && test -f configure || exit 77], [0], [ignore], [ignore])
-typedef struct IFTestIface {
- GTypeInterface parent;
+m4_define([MYVER],
+ m4_bpatsubst(m4_dquote(m4_defn([AT_PACKAGE_VERSION])), [[^][0-9.]]))
- void (*test)(GObject *obj);
-} IFTestIface;
+m4_define([MYVER_P1], m4_dquote(m4_reverse(m4_unquote(
+ m4_split(m4_defn([MYVER]), [[.]])))))
+m4_define([MYVER_P1], m4_join([.], m4_reverse(
+ m4_eval(m4_car(MYVER_P1)+1), m4_shift(MYVER_P1))))
-GType if_test_get_type(void);
+AT_DATA([test.in], [[@GOB2@
]])
-AT_DATA([test.gob],
-[[%{
-#include <stdio.h>
-#include "iface.h"
-%}
+cat >configure.ac <<EOF
+[m4@&t@_include([$builddir/gob2.m4])]
+[m4@&t@_pattern_forbid([^GOB2_])]
+[AC_INIT([gob2_check], [0])]
+[GOB2_CHECK(]m4_dquote(m4_defn([MYVER]))[)]
+GOB2=\`command -v \$GOB2\`
+[AC_CONFIG_FILES([test])]
+[AC_OUTPUT]
+EOF
+AT_CHECK([$AUTOCONF --force])
+AT_CHECK([./configure], [0], [ignore])
+
+command -v gob2 >expout
+AT_CHECK([cat test], [0], [expout], [ignore])
+
+sed '/GOB2_CHECK/c\
+[GOB2_CHECK(]m4_dquote(m4_defn([MYVER_P1]))[)]' configure.ac >configure.new
+mv -f configure.new configure.ac
+AT_CHECK([$AUTOCONF --force])
+AT_CHECK([./configure], [1], [ignore], [ignore])
-class :Test from G:Object (dynamic)
- (interface IF:Test)
+AT_CLEANUP
+
+AT_SETUP([private data members])
+
+AT_DATA([test.gob], [[%ctop{
+#include <config.h>
+%}
+class :Test from G:Object
{
- private const char *s = { "Hello, World!" };
- interface IF:Test private void test(G:Object *o)
- {
- Self *self = SELF(o);
- printf("%s\n", self->_priv->s);
- }
+ private int x = 42;
+
+ public int get_x(G:Object *go) { return TEST(go)->_priv->x; }
+ public void set_x(G:Object *go, int val) { TEST(go)->_priv->x = val; }
}
]])
+AT_CHECK([gob2 test.gob])
+AT_CHECK([$HAVE_GOBJECT_PRIVATES || exit 77])
+TEST_COMPILE_GOBJECT([test.c], [0], [], [ignore])
-AT_DATA([mod.gob],
-[[%{
+AT_DATA([main.c], [[#include <config.h>
+#include <stdio.h>
#include "test.h"
-%}
-class :Mod from G:Type:Module
+
+int main(void)
{
- override (G:Type:Module) gboolean load(G:Type:Module *m)
- {
- test_register_type(m);
- return TRUE;
- }
+ GObject *go = g_object_new(test_get_type(), NULL);
+
+ printf("%d\n", test_get_x(go));
+ printf("%d\n", (test_set_x(go, 123), test_get_x(go)));
+
+ return 0;
}
]])
+TEST_COMPILE_GOBJECT([main.c], [0], [], [ignore])
-AT_DATA([main.c],
-[[#include "test.h"
-#include "mod.h"
-#include "iface.h"
+AT_CHECK([$CC $CFLAGS $LDFLAGS $LIBGOBJECT_LIBS -o main \
+ test.o main.o])
+AT_CHECK([./main], [0], [42
+123
+])
-GType if_test_get_type(void)
+AT_CLEANUP
+
+AT_SETUP([private data members (dynamic)])
+
+AT_DATA([test.gob], [[%ctop{
+#include <config.h>
+%}
+class :Test from G:Object (dynamic)
{
- static GType type = 0;
- if (type == 0) {
- static const GTypeInfo info = {
- sizeof (IFTestIface),
- NULL,
- NULL,
- };
-
- type = g_type_register_static(G_TYPE_INTERFACE, "IFTest", &info, 0);
- }
- return type;
+ private int x = 54;
+
+ public int get_x(G:Object *go) { return TEST(go)->_priv->x; }
+ public void set_x(G:Object *go, int val) { TEST(go)->_priv->x = val; }
}
+]])
+AT_CHECK([gob2 test.gob])
+AT_CHECK([$HAVE_GOBJECT_PRIVATES || exit 77])
+TEST_COMPILE_GOBJECT([test.c], [0], [], [ignore])
+
+TEST_TYPE_MODULE([:Test])
+
+AT_DATA([main.c], [[#include <config.h>
+#include <stdio.h>
+#include "test.h"
+#include "test-mod.h"
int main(void)
{
- GTypeModule *m = g_object_new(TYPE_MOD, NULL);
- GObject *t;
+ GObject *go;
- g_type_module_use(m);
- t = g_object_new(TYPE_TEST, NULL);
+ g_type_module_use(g_object_new(test_mod_get_type(), NULL));
+ go = g_object_new(test_get_type(), NULL);
- g_return_val_if_fail(G_TYPE_CHECK_INSTANCE_TYPE(t, IF_TYPE_TEST),
- EXIT_FAILURE);
- G_TYPE_INSTANCE_GET_INTERFACE(t, IF_TYPE_TEST, IFTestIface)->test(t);
+ printf("%d\n", test_get_x(go));
+ printf("%d\n", (test_set_x(go, 123), test_get_x(go)));
- return EXIT_SUCCESS;
+ return 0;
}
]])
-
-AT_CHECK([gob2 mod.gob])
-AT_CHECK([gob2 test.gob])
-TEST_COMPILE_GOBJECT([mod.c], [0], [], [ignore])
-TEST_COMPILE_GOBJECT([test.c], [0], [], [ignore])
TEST_COMPILE_GOBJECT([main.c], [0], [], [ignore])
-AT_CHECK([$CC $CFLAGS $LDFLAGS $LIBGOBJECT_LIBS -o main mod.o test.o main.o])
-AT_CHECK([./main], [0], [Hello, World!
+
+AT_CHECK([$CC $CFLAGS $LDFLAGS $LIBGOBJECT_LIBS -o main \
+ test.o test-mod.o main.o])
+AT_CHECK([./main], [0], [54
+123
])
AT_CLEANUP
projects / gob-dx.git / blobdiff