Changeset 134ac5d in mainline for uspace/lib/pcut/tests


Ignore:
Timestamp:
2014-06-06T07:54:24Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8db09e4
Parents:
eeb23f2d
Message:

Update PCUT to newest version

Location:
uspace/lib/pcut/tests
Files:
8 added
14 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/pcut/tests/alloc.c

    reeb23f2d r134ac5d  
    2727 */
    2828
    29 #include <pcut/test.h>
     29#include <pcut/pcut.h>
    3030#include <stdlib.h>
    3131#include <stdio.h>

  • uspace/lib/pcut/tests/asserts.c

    reeb23f2d r134ac5d  
    2727 */
    2828
    29 #include <pcut/test.h>
     29#include <pcut/pcut.h>
    3030#include "tested.h"
    3131
    … …  
    4747}
    4848
     49PCUT_TEST(str_equals_or_null_base) {
     50        PCUT_ASSERT_STR_EQUALS_OR_NULL("xyz", "xyz");
     51}
     52
     53PCUT_TEST(str_equals_or_null_different) {
     54        PCUT_ASSERT_STR_EQUALS_OR_NULL("abc", "xyz");
     55}
     56
     57PCUT_TEST(str_equals_or_null_one_null) {
     58        PCUT_ASSERT_STR_EQUALS_OR_NULL(NULL, "xyz");
     59}
     60
     61PCUT_TEST(str_equals_or_null_both) {
     62        PCUT_ASSERT_STR_EQUALS_OR_NULL(NULL, NULL);
     63}
     64
     65PCUT_TEST(assert_true) {
     66        PCUT_ASSERT_TRUE(42);
     67        PCUT_ASSERT_TRUE(0);
     68}
     69
     70PCUT_TEST(assert_false) {
     71        PCUT_ASSERT_FALSE(0);
     72        PCUT_ASSERT_FALSE(42);
     73}
     74
    4975PCUT_MAIN()

  • uspace/lib/pcut/tests/asserts.expected

    reeb23f2d r134ac5d  
    1 1..3
     11..9
    22#> Starting suite Default.
    33not ok 1 int_equals failed
    … …  
    77not ok 3 str_equals failed
    88# error: asserts.c:46: Expected <abc> but got <xyz> ("abc" != "xyz")
    9 #> Finished suite Default (failed 3 of 3).
     9ok 4 str_equals_or_null_base
     10not ok 5 str_equals_or_null_different failed
     11# error: asserts.c:54: Expected <abc> but got <xyz> ("abc" != "xyz")
     12not ok 6 str_equals_or_null_one_null failed
     13# error: asserts.c:58: Expected <NULL> but got <xyz> (NULL != "xyz")
     14ok 7 str_equals_or_null_both
     15not ok 8 assert_true failed
     16# error: asserts.c:67: Expected true but got <0>
     17not ok 9 assert_false failed
     18# error: asserts.c:72: Expected false but got <42>
     19#> Finished suite Default (failed 7 of 9).

  • uspace/lib/pcut/tests/manytests.c

    reeb23f2d r134ac5d  
    2727 */
    2828
    29 #include <pcut/test.h>
     29#include <pcut/pcut.h>
    3030
    3131/*

  • uspace/lib/pcut/tests/null.c

    reeb23f2d r134ac5d  
    2727 */
    2828
    29 #include <pcut/test.h>
     29#include <pcut/pcut.h>
    3030#include "tested.h"
    3131

  • uspace/lib/pcut/tests/nullteardown.c

    reeb23f2d r134ac5d  
    2828
    2929#include <stdio.h>
    30 #include <pcut/test.h>
     30#include <pcut/pcut.h>
    3131#include "tested.h"
    3232

  • uspace/lib/pcut/tests/printing.c

    reeb23f2d r134ac5d  
    2727 */
    2828
    29 #include <pcut/test.h>
     29#include <pcut/pcut.h>
    3030#include "tested.h"
    3131#include <stdio.h>

  • uspace/lib/pcut/tests/simple.c

    reeb23f2d r134ac5d  
    2727 */
    2828
    29 #include <pcut/test.h>
     29#include <pcut/pcut.h>
    3030#include "tested.h"
    3131

  • uspace/lib/pcut/tests/suite1.c

    reeb23f2d r134ac5d  
    2727 */
    2828
    29 #include <pcut/test.h>
     29#include <pcut/pcut.h>
    3030#include "tested.h"
    3131

  • uspace/lib/pcut/tests/suite2.c

    reeb23f2d r134ac5d  
    2727 */
    2828
    29 #include <pcut/test.h>
     29#include <pcut/pcut.h>
    3030#include "tested.h"
    3131

  • uspace/lib/pcut/tests/suite_all.c

    reeb23f2d r134ac5d  
    2727 */
    2828
    29 #include <pcut/test.h>
     29#include <pcut/pcut.h>
    3030
    3131PCUT_INIT

  • uspace/lib/pcut/tests/suites.c

    reeb23f2d r134ac5d  
    2727 */
    2828
    29 #include <pcut/test.h>
     29#include <pcut/pcut.h>
    3030#include "tested.h"
    3131

  • uspace/lib/pcut/tests/teardown.c

    reeb23f2d r134ac5d  
    2828
    2929#include <stdio.h>
    30 #include <pcut/test.h>
     30#include <pcut/pcut.h>
    3131#include "tested.h"
    3232

  • uspace/lib/pcut/tests/tests.mak

    reeb23f2d r134ac5d  
    2727#
    2828
    29 TEST_DEPS = $(TEST_BASE)tested.o $(PCUT_LIB)
     29TEST_DEPS = $(TEST_BASE)tested.o
    3030
    3131TEST_APPS = \
    3232        $(TEST_BASE)alloc.$(EXE_EXT) \
    3333        $(TEST_BASE)asserts.$(EXE_EXT) \
     34        $(TEST_BASE)errno.$(EXE_EXT) \
    3435        $(TEST_BASE)manytests.$(EXE_EXT) \
    3536        $(TEST_BASE)multisuite.$(EXE_EXT) \
    … …  
    3839        $(TEST_BASE)printing.$(EXE_EXT) \
    3940        $(TEST_BASE)simple.$(EXE_EXT) \
     41        $(TEST_BASE)skip.$(EXE_EXT) \
    4042        $(TEST_BASE)suites.$(EXE_EXT) \
    41         $(TEST_BASE)teardown.$(EXE_EXT)
     43        $(TEST_BASE)teardown.$(EXE_EXT) \
     44        $(TEST_BASE)timeout.$(EXE_EXT)
    4245
    4346check-build: $(TEST_APPS)
    … …  
    4649
    4750check-clean:
    48         rm -f $(TEST_BASE)*.o $(TEST_BASE)*.$(EXE_EXT) $(TEST_BASE)*.got
     51        rm -f $(TEST_BASE)*.o $(TEST_BASE)*.pcut.c $(TEST_BASE)*.$(EXE_EXT) $(TEST_BASE)*.got
    4952
    5053$(TEST_BASE)%.$(EXE_EXT): $(TEST_DEPS)
    51         $(CC) -o $@ $^ $(TEST_LDFLAGS)
     54        $(LD) -o $@ $^ $(TEST_LDFLAGS)
    5255
    53 $(TEST_BASE)alloc.$(EXE_EXT): $(TEST_BASE)alloc.o
    54 $(TEST_BASE)asserts.$(EXE_EXT): $(TEST_BASE)asserts.o
    55 $(TEST_BASE)manytests.$(EXE_EXT): $(TEST_BASE)manytests.o
    56 $(TEST_BASE)multisuite.$(EXE_EXT): $(TEST_BASE)suite_all.o $(TEST_BASE)suite1.o $(TEST_BASE)suite2.o
    57 $(TEST_BASE)null.$(EXE_EXT): $(TEST_BASE)null.o
    58 $(TEST_BASE)nullteardown.$(EXE_EXT): $(TEST_BASE)nullteardown.o
    59 $(TEST_BASE)printing.$(EXE_EXT): $(TEST_BASE)printing.o
    60 $(TEST_BASE)simple.$(EXE_EXT): $(TEST_BASE)simple.o
    61 $(TEST_BASE)suites.$(EXE_EXT): $(TEST_BASE)suites.o
    62 $(TEST_BASE)teardown.$(EXE_EXT): $(TEST_BASE)teardown.o
     56$(TEST_BASE)alloc.$(EXE_EXT): $(TEST_BASE)alloc.o $(PCUT_LIB)
     57$(TEST_BASE)asserts.$(EXE_EXT): $(TEST_BASE)asserts.o $(PCUT_LIB)
     58$(TEST_BASE)errno.$(EXE_EXT): $(TEST_BASE)errno.o $(PCUT_LIB)
     59$(TEST_BASE)manytests.$(EXE_EXT): $(TEST_BASE)manytests.o $(PCUT_LIB)
     60$(TEST_BASE)multisuite.$(EXE_EXT): $(TEST_BASE)suite_all.o $(TEST_BASE)suite1.o $(TEST_BASE)suite2.o $(PCUT_LIB)
     61$(TEST_BASE)null.$(EXE_EXT): $(TEST_BASE)null.o $(PCUT_LIB)
     62$(TEST_BASE)nullteardown.$(EXE_EXT): $(TEST_BASE)nullteardown.o $(PCUT_LIB)
     63$(TEST_BASE)printing.$(EXE_EXT): $(TEST_BASE)printing.o $(PCUT_LIB)
     64$(TEST_BASE)simple.$(EXE_EXT): $(TEST_BASE)simple.o $(PCUT_LIB)
     65$(TEST_BASE)skip.$(EXE_EXT): $(TEST_BASE)skip.o $(PCUT_LIB)
     66$(TEST_BASE)suites.$(EXE_EXT): $(TEST_BASE)suites.o $(PCUT_LIB)
     67$(TEST_BASE)teardown.$(EXE_EXT): $(TEST_BASE)teardown.o $(PCUT_LIB)
     68$(TEST_BASE)timeout.$(EXE_EXT): $(TEST_BASE)timeout.o $(PCUT_LIB)
    6369
     70
     71ifeq ($(NEEDS_PREPROC),y)
     72$(TEST_BASE)%.o: $(TEST_BASE)%.pcut.c
     73        $(CC) -c -o $@ $(TEST_CFLAGS) $<
     74
     75$(TEST_BASE)%.pcut.c: $(TEST_BASE)%.c $(PCUT_PREPROC)
     76        $(CC) -E $(TEST_CFLAGS) $< | $(PCUT_PREPROC) >$@
     77else
    6478$(TEST_BASE)%.o: $(TEST_BASE)%.c
    6579        $(CC) -c -o $@ $(TEST_CFLAGS) $<
     80endif
Note: See TracChangeset for help on using the changeset viewer.