Ignore:
Timestamp:
Aug 9, 2018, 6:35:02 PM (8 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct
Children:
ea5b7d6
Parents:
fb975a50 (diff), 0c827019 (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 branch 'master' into jenkins-sandbox

Location:
tests/preempt_longrun
Files:
14 moved

Legend:

Unmodified
Added
Removed

  • tests/preempt_longrun/Makefile.am

    rfb975a50 r455a7d5  
    3232BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -O2 -DPREEMPTION_RATE=${preempt} -I.. -I. -DTEST_$(shell cat .type | tr a-z A-Z)
    3333CFLAGS = ${BUILD_FLAGS}
    34 CC = ${top_builddir}/src/driver/cfa
     34CC = @CFACC@
    3535
    3636TESTS = block coroutine create disjoint enter enter3 processor stack wait yield

  • tests/preempt_longrun/Makefile.in

    rfb975a50 r455a7d5  
    9191build_triplet = @build@
    9292host_triplet = @host@
    93 subdir = src/tests/preempt_longrun
     93subdir = tests/preempt_longrun
    9494ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    95 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     95am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
     96        $(top_srcdir)/configure.ac
    9697am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    9798        $(ACLOCAL_M4)
    … …  
    337338AWK = @AWK@
    338339BACKEND_CC = @BACKEND_CC@
    339 CC = ${top_builddir}/src/driver/cfa
     340BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     341CC = @CFACC@
    340342CCAS = @CCAS@
    341343CCASDEPMODE = @CCASDEPMODE@
    342344CCASFLAGS = @CCASFLAGS@
    343345CCDEPMODE = @CCDEPMODE@
     346CFACC = @CFACC@
     347CFACPP = @CFACPP@
    344348CFA_BACKEND_CC = @CFA_BACKEND_CC@
    345349CFA_BINDIR = @CFA_BINDIR@
    … …  
    358362DEFS = @DEFS@
    359363DEPDIR = @DEPDIR@
     364DRIVER_DIR = @DRIVER_DIR@
    360365ECHO_C = @ECHO_C@
    361366ECHO_N = @ECHO_N@
    … …  
    373378LEXLIB = @LEXLIB@
    374379LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
     380LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
     381LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
    375382LIBOBJS = @LIBOBJS@
    376383LIBS = @LIBS@
    377384LTLIBOBJS = @LTLIBOBJS@
    378 MACHINE_TYPE = @MACHINE_TYPE@
    379385MAKEINFO = @MAKEINFO@
    380386MKDIR_P = @MKDIR_P@
    … …  
    392398SHELL = @SHELL@
    393399STRIP = @STRIP@
     400TARGET_HOSTS = @TARGET_HOSTS@
    394401VERSION = @VERSION@
    395402YACC = @YACC@
    … …  
    474481          esac; \
    475482        done; \
    476         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/tests/preempt_longrun/Makefile'; \
     483        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/preempt_longrun/Makefile'; \
    477484        $(am__cd) $(top_srcdir) && \
    478           $(AUTOMAKE) --foreign src/tests/preempt_longrun/Makefile
     485          $(AUTOMAKE) --foreign tests/preempt_longrun/Makefile
    479486Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    480487        @case '$?' in \

  • tests/preempt_longrun/create.c

    rfb975a50 r455a7d5  
    1 #include <kernel>
    2 #include <thread>
    3 #include <time>
     1#include <kernel.hfa>
     2#include <thread.hfa>
     3#include <time.hfa>
    44
    55#include "long_tests.h"

  • tests/preempt_longrun/enter.c

    rfb975a50 r455a7d5  
    1 #include <kernel>
    2 #include <monitor>
    3 #include <thread>
    4 #include <time>
     1#include <kernel.hfa>
     2#include <monitor.hfa>
     3#include <thread.hfa>
     4#include <time.hfa>
    55
    66#define __kick_rate 75000ul

  • tests/preempt_longrun/enter3.c

    rfb975a50 r455a7d5  
    1 #include <kernel>
    2 #include <monitor>
    3 #include <thread>
    4 #include <time>
     1#include <kernel.hfa>
     2#include <monitor.hfa>
     3#include <thread.hfa>
     4#include <time.hfa>
    55
    66#define __kick_rate 75000ul

  • tests/preempt_longrun/processor.c

    rfb975a50 r455a7d5  
    1 #include <kernel>
    2 #include <thread>
    3 #include <time>
     1#include <kernel.hfa>
     2#include <thread.hfa>
     3#include <time.hfa>
    44
    55#include <unistd.h>

  • tests/preempt_longrun/stack.c

    rfb975a50 r455a7d5  
    1 #include <kernel>
    2 #include <math>
    3 #include <thread>
    4 #include <time>
     1#include <kernel.hfa>
     2#include <math.hfa>
     3#include <thread.hfa>
     4#include <time.hfa>
    55
    66#define __kick_rate 5000000ul

  • tests/preempt_longrun/yield.c

    rfb975a50 r455a7d5  
    1 #include <kernel>
    2 #include <thread>
    3 #include <time>
     1#include <kernel.hfa>
     2#include <thread.hfa>
     3#include <time.hfa>
    44
    55#define __kick_rate 550000ul
Note: See TracChangeset for help on using the changeset viewer.