maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Combined tests into single executable.

Browse Source
This commit is contained in:
Michael Jumper 2012-08-27 14:44:17 -07:00
parent 114ac20f25
commit bc5065cda4
3 changed files with 9 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libguac/tests/Makefile.am
View File

@ -38,25 +38,20 @@ AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = -Werror -Wall -pedantic -I../include
TESTS = test_protocol test_client
check_PROGRAMS = test_protocol test_client
TESTS = test_libguac
check_PROGRAMS = test_libguac
noinst_HEADERS = \
protocol/suite.h \
client/client_suite.h
test_protocol_SOURCES = \
test_protocol.c \
test_libguac_SOURCES = \
test_libguac.c \
protocol/suite.c \
protocol/instruction_read.c \
protocol/instruction_write.c
test_protocol_LDADD = $(top_builddir)/src/libguac.la @CUNIT_LIBS@
test_client_SOURCES = \
test_client.c \
client/client_suite.c \
protocol/instruction_write.c \
client/client_suite.c \
client/layer_pool.c
test_client_LDADD = $(top_builddir)/src/libguac.la @CUNIT_LIBS@
test_libguac_LDADD = $(top_builddir)/src/libguac.la @CUNIT_LIBS@

2
libguac/tests/test_client.c → libguac/tests/test_libguac.c
View File

@ -37,6 +37,7 @@
#include <CUnit/Basic.h>
#include "protocol/suite.h"
#include "client/client_suite.h"
int main() {
@ -46,6 +47,7 @@ int main() {
return CU_get_error();
/* Register suites */
register_protocol_suite();
register_client_suite();
/* Run tests */

58
libguac/tests/test_protocol.c
View File

@ -1,58 +0,0 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is libguac.
*
* The Initial Developer of the Original Code is
* Michael Jumper.
* Portions created by the Initial Developer are Copyright (C) 2010
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include <CUnit/Basic.h>
#include "protocol/suite.h"
int main() {
/* Init registry */
if (CU_initialize_registry() != CUE_SUCCESS)
return CU_get_error();
/* Register suites */
register_protocol_suite();
/* Run tests */
CU_basic_set_mode(CU_BRM_VERBOSE);
CU_basic_run_tests();
CU_cleanup_registry();
return CU_get_error();
}