From: Daniel Díaz Date: Thu, 17 Jan 2013 06:38:14 +0000 (-0600) Subject: tests: fix ABI check struct sizes for ARM X-Git-Tag: 1.1.1~315 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a26a98209b0df4bfffa079e7cd7e94c565bc6806;p=platform%2Fupstream%2Fgstreamer.git tests: fix ABI check struct sizes for ARM and re-enable ABI check for ARM. https://bugzilla.gnome.org/show_bug.cgi?id=691828 --- diff --git a/tests/check/gst/gstabi.c b/tests/check/gst/gstabi.c index 751a102..a9e2fd6 100644 --- a/tests/check/gst/gstabi.c +++ b/tests/check/gst/gstabi.c @@ -48,7 +48,7 @@ #else #ifdef HAVE_CPU_ARM #include "struct_arm.h" -#define HAVE_ABI_SIZES FALSE +#define HAVE_ABI_SIZES TRUE #else /* in case someone wants to generate a new arch */ #include "struct_i386.h" diff --git a/tests/check/gst/struct_arm.h b/tests/check/gst/struct_arm.h index b7a2952..db6ed90 100644 --- a/tests/check/gst/struct_arm.h +++ b/tests/check/gst/struct_arm.h @@ -1,72 +1,73 @@ -static GstCheckABIStruct list[] = { - {"GstAllocationParams", sizeof (GstAllocationParams), 64}, - {"GstAllocator", sizeof (GstAllocator), 176}, - {"GstAllocatorClass", sizeof (GstAllocatorClass), 232}, - {"GstBinClass", sizeof (GstBinClass), 576}, - {"GstBin", sizeof (GstBin), 376}, - {"GstBuffer", sizeof (GstBuffer), 112}, - {"GstBufferPoolAcquireParams", sizeof (GstBufferPoolAcquireParams), 64}, - {"GstBufferPool", sizeof (GstBufferPool), 136}, - {"GstBufferPoolClass", sizeof (GstBufferPoolClass), 288}, - {"GstBusClass", sizeof (GstBusClass), 232}, - {"GstBus", sizeof (GstBus), 128}, - {"GstCaps", sizeof (GstCaps), 64}, - {"GstChildProxyInterface", sizeof (GstChildProxyInterface), 88}, - {"GstClockClass", sizeof (GstClockClass), 264}, - {"GstClockEntry", sizeof (GstClockEntry), 112}, - {"GstClock", sizeof (GstClock), 128}, - {"GstControlBinding", sizeof (GstControlBinding), 152}, - {"GstControlBindingClass", sizeof (GstControlBindingClass), 248}, - {"GstControlSource", sizeof (GstControlSource), 136}, - {"GstControlSourceClass", sizeof (GstControlSourceClass), 216}, - {"GstDebugCategory", sizeof (GstDebugCategory), 24}, - {"GstElementClass", sizeof (GstElementClass), 488}, - {"GstElement", sizeof (GstElement), 264}, - {"GstEvent", sizeof (GstEvent), 88}, - {"GstFormatDefinition", sizeof (GstFormatDefinition), 32}, - {"GstGhostPadClass", sizeof (GstGhostPadClass), 272}, - {"GstGhostPad", sizeof (GstGhostPad), 536}, - {"GstIterator", sizeof (GstIterator), 120}, - {"GstMemory", sizeof (GstMemory), 112}, - {"GstMapInfo", sizeof (GstMapInfo), 104}, - {"GstMessage", sizeof (GstMessage), 120}, - {"GstMeta", sizeof (GstMeta), 16}, - {"GstMetaTransformCopy", sizeof (GstMetaTransformCopy), 24}, - {"GstMetaInfo", sizeof (GstMetaInfo), 80}, - {"GstMiniObject", sizeof (GstMiniObject), 64}, - {"GstObjectClass", sizeof (GstObjectClass), 184}, - {"GstObject", sizeof (GstObject), 88}, - {"GstPadClass", sizeof (GstPadClass), 232}, - {"GstPad", sizeof (GstPad), 520}, - {"GstPadProbeInfo", sizeof (GstPadProbeInfo), 72}, - {"GstPadTemplateClass", sizeof (GstPadTemplateClass), 224}, - {"GstPadTemplate", sizeof (GstPadTemplate), 144}, - {"GstParamSpecFraction", sizeof (GstParamSpecFraction), 96}, - {"GstPipelineClass", sizeof (GstPipelineClass), 608}, - {"GstPipeline", sizeof (GstPipeline), 440}, - {"GstPluginDesc", sizeof (GstPluginDesc), 112}, - {"GstPresetInterface", sizeof (GstPresetInterface), 112}, - {"GstProxyPadClass", sizeof (GstProxyPadClass), 240}, - {"GstProxyPad", sizeof (GstProxyPad), 528}, - {"GstQuery", sizeof (GstQuery), 72}, - {"GstRegistryClass", sizeof (GstRegistryClass), 184}, - {"GstRegistry", sizeof (GstRegistry), 96}, - {"GstSegment", sizeof (GstSegment), 120}, - {"GstStaticCaps", sizeof (GstStaticCaps), 48}, - {"GstStaticPadTemplate", sizeof (GstStaticPadTemplate), 64}, - {"GstStructure", sizeof (GstStructure), 16}, - {"GstSystemClockClass", sizeof (GstSystemClockClass), 296}, - {"GstSystemClock", sizeof (GstSystemClock), 168}, - {"GstTagList", sizeof (GstTagList), 64,}, - {"GstTagSetterInterface", sizeof (GstTagSetterInterface), 16}, - {"GstTaskClass", sizeof (GstTaskClass), 224}, - {"GstTask", sizeof (GstTask), 200}, - {"GstTaskPoolClass", sizeof (GstTaskPoolClass), 248}, - {"GstTaskPool", sizeof (GstTaskPool), 128}, + +GstCheckABIStruct list[] = { + {"GstAllocationParams", sizeof (GstAllocationParams), 32}, + {"GstAllocator", sizeof (GstAllocator), 112}, + {"GstAllocatorClass", sizeof (GstAllocatorClass), 116}, + {"GstBinClass", sizeof (GstBinClass), 292}, + {"GstBin", sizeof (GstBin), 248}, + {"GstBuffer", sizeof (GstBuffer), 80}, + {"GstBufferPoolAcquireParams", sizeof (GstBufferPoolAcquireParams), 48}, + {"GstBufferPool", sizeof (GstBufferPool), 88}, + {"GstBufferPoolClass", sizeof (GstBufferPoolClass), 144}, + {"GstBusClass", sizeof (GstBusClass), 116}, + {"GstBus", sizeof (GstBus), 88}, + {"GstCaps", sizeof (GstCaps), 36}, + {"GstChildProxyInterface", sizeof (GstChildProxyInterface), 44}, + {"GstClockClass", sizeof (GstClockClass), 132}, + {"GstClockEntry", sizeof (GstClockEntry), 72}, + {"GstClock", sizeof (GstClock), 88}, + {"GstControlBinding", sizeof (GstControlBinding), 96}, + {"GstControlBindingClass", sizeof (GstControlBindingClass), 124}, + {"GstControlSource", sizeof (GstControlSource), 88}, + {"GstControlSourceClass", sizeof (GstControlSourceClass), 108}, + {"GstDebugCategory", sizeof (GstDebugCategory), 16}, + {"GstElementClass", sizeof (GstElementClass), 248}, + {"GstElement", sizeof (GstElement), 184}, + {"GstEvent", sizeof (GstEvent), 56}, + {"GstFormatDefinition", sizeof (GstFormatDefinition), 16}, + {"GstGhostPadClass", sizeof (GstGhostPadClass), 136}, + {"GstGhostPad", sizeof (GstGhostPad), 320}, + {"GstIterator", sizeof (GstIterator), 60}, + {"GstMemory", sizeof (GstMemory), 60}, + {"GstMapInfo", sizeof (GstMapInfo), 52}, + {"GstMessage", sizeof (GstMessage), 80}, + {"GstMeta", sizeof (GstMeta), 8}, + {"GstMetaTransformCopy", sizeof (GstMetaTransformCopy), 12}, + {"GstMetaInfo", sizeof (GstMetaInfo), 40}, + {"GstMiniObject", sizeof (GstMiniObject), 36}, + {"GstObjectClass", sizeof (GstObjectClass), 92}, + {"GstObject", sizeof (GstObject), 64}, + {"GstPadClass", sizeof (GstPadClass), 116}, + {"GstPad", sizeof (GstPad), 304}, + {"GstPadProbeInfo", sizeof (GstPadProbeInfo), 48}, + {"GstPadTemplateClass", sizeof (GstPadTemplateClass), 112}, + {"GstPadTemplate", sizeof (GstPadTemplate), 96}, + {"GstParamSpecFraction", sizeof (GstParamSpecFraction), 64}, + {"GstPipelineClass", sizeof (GstPipelineClass), 308}, + {"GstPipeline", sizeof (GstPipeline), 296}, + {"GstPluginDesc", sizeof (GstPluginDesc), 60}, + {"GstPresetInterface", sizeof (GstPresetInterface), 56}, + {"GstProxyPadClass", sizeof (GstProxyPadClass), 120}, + {"GstProxyPad", sizeof (GstProxyPad), 312}, + {"GstQuery", sizeof (GstQuery), 40}, + {"GstRegistryClass", sizeof (GstRegistryClass), 92}, + {"GstRegistry", sizeof (GstRegistry), 72}, + {"GstSegment", sizeof (GstSegment), 104}, + {"GstStaticCaps", sizeof (GstStaticCaps), 24}, + {"GstStaticPadTemplate", sizeof (GstStaticPadTemplate), 36}, + {"GstStructure", sizeof (GstStructure), 8}, + {"GstSystemClockClass", sizeof (GstSystemClockClass), 148}, + {"GstSystemClock", sizeof (GstSystemClock), 112}, + {"GstTagList", sizeof (GstTagList), 36}, + {"GstTagSetterInterface", sizeof (GstTagSetterInterface), 8}, + {"GstTaskClass", sizeof (GstTaskClass), 112}, + {"GstTask", sizeof (GstTask), 128}, + {"GstTaskPoolClass", sizeof (GstTaskPoolClass), 124}, + {"GstTaskPool", sizeof (GstTaskPool), 88}, {"GstTimedValue", sizeof (GstTimedValue), 16}, - {"GstTocSetterInterface", sizeof (GstTocSetterInterface), 16}, - {"GstTypeFind", sizeof (GstTypeFind), 64}, - {"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 48}, - {"GstValueTable", sizeof (GstValueTable), 64}, + {"GstTocSetterInterface", sizeof (GstTocSetterInterface), 8}, + {"GstTypeFind", sizeof (GstTypeFind), 32}, + {"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 24}, + {"GstValueTable", sizeof (GstValueTable), 32}, {NULL, 0, 0} }; diff --git a/tests/check/libs/libsabi.c b/tests/check/libs/libsabi.c index c7169c1..42ca40f 100644 --- a/tests/check/libs/libsabi.c +++ b/tests/check/libs/libsabi.c @@ -70,7 +70,7 @@ #else #ifdef HAVE_CPU_ARM #include "struct_arm.h" -#define HAVE_ABI_SIZES FALSE +#define HAVE_ABI_SIZES TRUE #else /* in case someone wants to generate a new arch */ #include "struct_i386.h" diff --git a/tests/check/libs/struct_arm.h b/tests/check/libs/struct_arm.h index 484298e..8c99bf2 100644 --- a/tests/check/libs/struct_arm.h +++ b/tests/check/libs/struct_arm.h @@ -1,39 +1,39 @@ GstCheckABIStruct list[] = { - {"GstBaseParseClass", sizeof (GstBaseParseClass), 728}, - {"GstBaseParse", sizeof (GstBaseParse), 576}, - {"GstBaseSinkClass", sizeof (GstBaseSinkClass), 792}, - {"GstBaseSink", sizeof (GstBaseSink), 664}, - {"GstBaseSrcClass", sizeof (GstBaseSrcClass), 800}, - {"GstBaseSrc", sizeof (GstBaseSrc), 648}, - {"GstBaseTransformClass", sizeof (GstBaseTransformClass), 816}, - {"GstBaseTransform", sizeof (GstBaseTransform), 576}, - {"GstBitReader", sizeof (GstBitReader), 56}, - {"GstByteReader", sizeof (GstByteReader), 48}, - {"GstByteWriter", sizeof (GstByteWriter), 96}, - {"GstCollectData", sizeof (GstCollectData), 200}, - {"GstCollectPadsClass", sizeof (GstCollectPadsClass), 216}, - {"GstCollectPads", sizeof (GstCollectPads), 152}, - {"GstARGBControlBindingClass", sizeof (GstARGBControlBindingClass), 280}, - {"GstARGBControlBinding", sizeof (GstARGBControlBinding), 248}, - {"GstDirectControlBindingClass", sizeof (GstDirectControlBindingClass), 280}, - {"GstDirectControlBinding", sizeof (GstDirectControlBinding), 248}, - {"GstInterpolationControlSourceClass", sizeof (GstInterpolationControlSourceClass), 280}, - {"GstInterpolationControlSource", sizeof (GstInterpolationControlSource), 240}, - {"GstLFOControlSourceClass", sizeof (GstLFOControlSourceClass), 248}, - {"GstLFOControlSource", sizeof (GstLFOControlSource), 184}, + {"GstBaseParseClass", sizeof (GstBaseParseClass), 368}, + {"GstBaseParse", sizeof (GstBaseParse), 392}, + {"GstBaseSinkClass", sizeof (GstBaseSinkClass), 400}, + {"GstBaseSink", sizeof (GstBaseSink), 464}, + {"GstBaseSrcClass", sizeof (GstBaseSrcClass), 404}, + {"GstBaseSrc", sizeof (GstBaseSrc), 448}, + {"GstBaseTransformClass", sizeof (GstBaseTransformClass), 416}, + {"GstBaseTransform", sizeof (GstBaseTransform), 392}, + {"GstBitReader", sizeof (GstBitReader), 32}, + {"GstByteReader", sizeof (GstByteReader), 28}, + {"GstByteWriter", sizeof (GstByteWriter), 56}, + {"GstCollectData", sizeof (GstCollectData), 144}, + {"GstCollectPadsClass", sizeof (GstCollectPadsClass), 108}, + {"GstCollectPads", sizeof (GstCollectPads), 104}, + {"GstARGBControlBindingClass", sizeof (GstARGBControlBindingClass), 140}, + {"GstARGBControlBinding", sizeof (GstARGBControlBinding), 160}, + {"GstDirectControlBindingClass", sizeof (GstDirectControlBindingClass), 140}, + {"GstDirectControlBinding", sizeof (GstDirectControlBinding), 168}, + {"GstInterpolationControlSourceClass", sizeof (GstInterpolationControlSourceClass), 140}, + {"GstInterpolationControlSource", sizeof (GstInterpolationControlSource), 152}, + {"GstLFOControlSourceClass", sizeof (GstLFOControlSourceClass), 124}, + {"GstLFOControlSource", sizeof (GstLFOControlSource), 120}, {"GstControlPoint", sizeof (GstControlPoint), 32}, - {"GstTimedValueControlSourceClass", sizeof (GstTimedValueControlSourceClass), 248}, - {"GstTimedValueControlSource", sizeof (GstTimedValueControlSource), 200}, - {"GstTriggerControlSourceClass", sizeof (GstTriggerControlSourceClass), 280}, - {"GstTriggerControlSource", sizeof (GstTriggerControlSource), 240}, - {"GstNetClientClockClass", sizeof (GstNetClientClockClass), 328}, - {"GstNetClientClock", sizeof (GstNetClientClock), 208}, + {"GstTimedValueControlSourceClass", sizeof (GstTimedValueControlSourceClass), 124}, + {"GstTimedValueControlSource", sizeof (GstTimedValueControlSource), 128}, + {"GstTriggerControlSourceClass", sizeof (GstTriggerControlSourceClass), 140}, + {"GstTriggerControlSource", sizeof (GstTriggerControlSource), 152}, + {"GstNetClientClockClass", sizeof (GstNetClientClockClass), 164}, + {"GstNetClientClock", sizeof (GstNetClientClock), 136}, {"GstNetTimePacket", sizeof (GstNetTimePacket), 16}, - {"GstNetTimeProviderClass", sizeof (GstNetTimeProviderClass), 216}, - {"GstNetTimeProvider", sizeof (GstNetTimeProvider), 128}, - {"GstPushSrcClass", sizeof (GstPushSrcClass), 856}, - {"GstPushSrc", sizeof (GstPushSrc), 680}, + {"GstNetTimeProviderClass", sizeof (GstNetTimeProviderClass), 108}, + {"GstNetTimeProvider", sizeof (GstNetTimeProvider), 88}, + {"GstPushSrcClass", sizeof (GstPushSrcClass), 432}, + {"GstPushSrc", sizeof (GstPushSrc), 464}, {"GstTimedValue", sizeof (GstTimedValue), 16}, {NULL, 0, 0} };