fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-28 16:48:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: Move dbus-message-factory and most of dbus-message-util into test/

Browse source 
As with previous moves, I've tried to extract the possible copyright
holders from the git history.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2018-09-28 16:32:03 +01:00
parent 28f3ecf190
commit f1f5294276
11 changed files with 1741 additions and 1649 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/dbus/CMakeLists.txt
View file

@ -156,7 +156,6 @@ set (DBUS_UTIL_SOURCES
${DBUS_DIR}/dbus-marshal-byteswap-util.c
${DBUS_DIR}/dbus-marshal-recursive-util.c
${DBUS_DIR}/dbus-marshal-validate-util.c
${DBUS_DIR}/dbus-message-factory.c
${DBUS_DIR}/dbus-message-util.c
${DBUS_DIR}/dbus-shell.c
${DBUS_DIR}/dbus-pollable-set.c
@ -168,7 +167,6 @@ set (DBUS_UTIL_SOURCES
set (DBUS_UTIL_HEADERS
${DBUS_DIR}/dbus-asv-util.h
${DBUS_DIR}/dbus-mainloop.h
${DBUS_DIR}/dbus-message-factory.h
${DBUS_DIR}/dbus-shell.h
${DBUS_DIR}/dbus-pollable-set.h
${DBUS_DIR}/dbus-spawn.h

7
cmake/test/CMakeLists.txt
View file

@ -99,7 +99,12 @@ if(DBUS_ENABLE_EMBEDDED_TESTS)
add_test_executable(test-marshal-recursive ${TEST_DIR}/internals/marshal-recursive.c dbus-testutils)
set_target_properties(test-marshal-recursive PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
add_test_executable(test-message-internals ${TEST_DIR}/internals/message-internals.c dbus-testutils)
set(SOURCES ${TEST_DIR}/internals/dbus-message-factory.c
${TEST_DIR}/internals/dbus-message-factory.h
${TEST_DIR}/internals/dbus-message-util.c
${TEST_DIR}/internals/dbus-message-util.h
${TEST_DIR}/internals/message-internals.c)
add_test_executable(test-message-internals "${SOURCES}" dbus-testutils)
set_target_properties(test-message-internals PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
set(SOURCES ${TEST_DIR}/internals/dbus-auth-script.c

2
dbus/Makefile.am
View file

@ -250,8 +250,6 @@ DBUS_UTIL_SOURCES= \
dbus-marshal-byteswap-util.c \
dbus-marshal-recursive-util.c \
dbus-marshal-validate-util.c \
dbus-message-factory.c \
dbus-message-factory.h \
dbus-message-util.c \
dbus-shell.c \
dbus-shell.h \

1641
dbus/dbus-message-util.c
View file

File diff suppressed because it is too large Load diff

2
dbus/dbus-test.h
View file

@ -64,8 +64,6 @@ dbus_bool_t _dbus_address_test (const char *test_data_dir);
DBUS_PRIVATE_EXPORT
dbus_bool_t _dbus_server_test (const char *test_data_dir);
dbus_bool_t _dbus_message_test (const char *test_data_dir);
DBUS_PRIVATE_EXPORT
dbus_bool_t _dbus_sha_test (const char *test_data_dir);

8
test/Makefile.am
View file

@ -206,7 +206,13 @@ test_hash_LDADD = libdbus-testutils.la
test_marshal_recursive_SOURCES = internals/marshal-recursive.c
test_marshal_recursive_LDADD = libdbus-testutils.la
test_message_internals_SOURCES = internals/message-internals.c
test_message_internals_SOURCES = \
internals/dbus-message-factory.c \
internals/dbus-message-factory.h \
internals/dbus-message-util.c \
internals/dbus-message-util.h \
internals/message-internals.c \
$(NULL)
test_message_internals_LDADD = libdbus-testutils.la
test_misc_internals_SOURCES = \

10
dbus/dbus-message-factory.c → test/internals/dbus-message-factory.c
View file

@ -26,10 +26,12 @@
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
#include "dbus-message-factory.h"
#include "dbus-message-private.h"
#include "dbus-signature.h"
#include "dbus-test.h"
#include <dbus/dbus-test-tap.h>
#include "dbus/dbus-message-private.h"
#include "dbus/dbus-signature.h"
#include "dbus/dbus-test.h"
#include "dbus/dbus-test-tap.h"
#include <stdio.h>
typedef enum

0
dbus/dbus-message-factory.h → test/internals/dbus-message-factory.h
View file

1677
test/internals/dbus-message-util.c Normal file
View file

File diff suppressed because it is too large Load diff

39
test/internals/dbus-message-util.h Normal file
View file

@ -0,0 +1,39 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/*
* Copyright 2002-2009 Red Hat, Inc.
* Copyright 2002-2003 CodeFactory AB
* Copyright 2007-2018 Collabora Ltd.
* Copyright 2009 Scott James Remnant / Canonical Ltd.
* Copyright 2009 William Lachance
* Copyright 2010 Christian Dywan / Lanedo
* Copyright 2013 Chengwei Yang / Intel
* Copyright 2013 Vasiliy Balyasnyy / Samsung
* Copyright 2014 Ralf Habacker
* Copyright 2017 Endless Mobile, Inc.
*
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#ifndef TEST_INTERNALS_DBUS_MESSAGE_UTIL_H
#define TEST_INTERNALS_DBUS_MESSAGE_UTIL_H
#include <dbus/dbus-types.h>
dbus_bool_t _dbus_message_test (const char *test_data_dir);
#endif

2
test/internals/message-internals.c
View file

@ -27,6 +27,8 @@
#include "dbus/dbus-test.h"
#include "test/test-utils.h"
#include "dbus-message-util.h"
static DBusTestCase test = { "message", _dbus_message_test };
int