Changeset b1c57a8 in mainline for kernel/test


Ignore:
Timestamp:
2014-10-09T15:03:55Z (11 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e367939c
Parents:
21799398 (diff), 207e8880 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge from lp:~adam-hraska+lp/helenos/rcu/.

Only merge from the feature branch and resolve all conflicts.

Location:
kernel/test
Files:
11 added
2 edited

Legend:

Unmodified
Added
Removed

  • kernel/test/test.c

    r21799398 rb1c57a8  
    4141#include <avltree/avltree1.def>
    4242#include <btree/btree1.def>
     43#include <cht/cht1.def>
    4344#include <debug/mips1.def>
    4445#include <fault/fault1.def>
    … …  
    5051#include <synch/semaphore1.def>
    5152#include <synch/semaphore2.def>
     53#include <synch/rcu1.def>
     54#include <synch/workqueue2.def>
     55#include <synch/workqueue3.def>
    5256#include <print/print1.def>
    5357#include <print/print2.def>
    … …  
    5660#include <print/print5.def>
    5761#include <thread/thread1.def>
     62#include <smpcall/smpcall1.def>
    5863        {
    5964                .name = NULL,

  • kernel/test/test.h

    r21799398 rb1c57a8  
    5959extern const char *test_avltree1(void);
    6060extern const char *test_btree1(void);
     61extern const char *test_cht1(void);
    6162extern const char *test_mips1(void);
    6263extern const char *test_fault1(void);
    … …  
    7576extern const char *test_print5(void);
    7677extern const char *test_thread1(void);
     78extern const char *test_smpcall1(void);
     79extern const char *test_workqueue_all(void);
     80extern const char *test_workqueue3(void);
     81extern const char *test_workqueue3quit(void);
     82extern const char *test_rcu1(void);
     83
    7784
    7885extern test_t tests[];
Note: See TracChangeset for help on using the changeset viewer.