From 4a4e956c26d2f73534e504c36e2ca6a2617644b8 Mon Sep 17 00:00:00 2001 From: Nicolas Dato Date: Sun, 13 Oct 2024 19:57:49 -0300 Subject: adding tests for the main library --- .gitignore | 9 +- Makefile.am | 2 +- Makefile.in | 12 +- config.h.in | 10 + config.h.in~ | 55 --- configure | 378 +++++++++++++++--- configure.ac | 36 +- src/Makefile.in | 1 + src/itc.c | 28 +- src/itc.h | 13 +- src/tuberia.c | 34 +- src/tuberia.h | 15 +- src/utils.h | 6 +- test/Makefile.am | 33 ++ test/Makefile.in | 963 +++++++++++++++++++++++++++++++++++++++++++++ test/test.h | 9 + test/test_itc.c | 171 ++++++++ test/test_itc_valgrind | 3 + test/test_tuberia.c | 110 ++++++ test/test_tuberia_valgrind | 3 + tuberia.pc.in | 11 + 21 files changed, 1763 insertions(+), 139 deletions(-) delete mode 100644 config.h.in~ create mode 100644 test/Makefile.am create mode 100644 test/Makefile.in create mode 100644 test/test.h create mode 100644 test/test_itc.c create mode 100755 test/test_itc_valgrind create mode 100644 test/test_tuberia.c create mode 100755 test/test_tuberia_valgrind create mode 100644 tuberia.pc.in diff --git a/.gitignore b/.gitignore index 8c0ccd4..43cbaca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ Makefile +tuberia.pc config.h config.log config.status @@ -10,4 +11,10 @@ test-driver .deps *.o *~ -libtuberia-1.0.0.tar.gz +libtuberia-*.tar.gz +.ycm_extra_conf.py + +test/*.log +test/*.trs +test/test_itc +test/test_tuberia diff --git a/Makefile.am b/Makefile.am index 1bfdcf4..b4b5bc3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1 @@ -SUBDIRS=src +SUBDIRS = src test diff --git a/Makefile.in b/Makefile.in index 1adb559..dd93300 100644 --- a/Makefile.in +++ b/Makefile.in @@ -96,7 +96,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = tuberia.pc CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -155,8 +155,9 @@ ETAGS = etags CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) -am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in COPYING \ - INSTALL ar-lib compile depcomp install-sh missing +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/tuberia.pc.in COPYING INSTALL ar-lib compile depcomp \ + install-sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -266,6 +267,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +has_valgrind = @has_valgrind@ host_alias = @host_alias@ htmldir = @htmldir@ includedir = @includedir@ @@ -290,7 +292,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = src +SUBDIRS = src test all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -343,6 +345,8 @@ $(srcdir)/config.h.in: $(am__configure_deps) distclean-hdr: -rm -f config.h stamp-h1 +tuberia.pc: $(top_builddir)/config.status $(srcdir)/tuberia.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ # This directory's subdirectories are mostly independent; you can cd # into them and run 'make' without going through this Makefile. diff --git a/config.h.in b/config.h.in index dcacdf9..78466ef 100644 --- a/config.h.in +++ b/config.h.in @@ -6,6 +6,13 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the `pthread' library (-lpthread). */ +#undef HAVE_LIBPTHREAD + +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ +#undef HAVE_MALLOC + /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H @@ -59,3 +66,6 @@ /* Version number of package */ #undef VERSION + +/* Define to rpl_malloc if the replacement function should be used. */ +#undef malloc diff --git a/config.h.in~ b/config.h.in~ deleted file mode 100644 index 02e8851..0000000 --- a/config.h.in~ +++ /dev/null @@ -1,55 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to 1 if you have the `gettimeofday' function. */ -#undef HAVE_GETTIMEOFDAY - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TIME_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS diff --git a/configure b/configure index e072deb..44769a3 100755 --- a/configure +++ b/configure @@ -583,7 +583,7 @@ PACKAGE_BUGREPORT='' PACKAGE_URL='' ac_unique_file="src/tuberia.c" -ac_default_prefix="/usr" +ac_default_prefix=/usr # Factoring default headers for most tests. ac_includes_default="\ #include @@ -623,6 +623,15 @@ ac_includes_default="\ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS +VALGRIND_FALSE +VALGRIND_TRUE +TUBERIATEST_FALSE +TUBERIATEST_TRUE +ITCTEST_FALSE +ITCTEST_TRUE +TESTS_FALSE +TESTS_TRUE +has_valgrind LIBOBJS EGREP GREP @@ -718,6 +727,10 @@ ac_user_opts=' enable_option_checking enable_silent_rules enable_dependency_tracking +enable_valgrind +enable_tests +enable_itc_test +enable_tuberia_test ' ac_precious_vars='build_alias host_alias @@ -1348,6 +1361,10 @@ Optional Features: do not reject slow dependency extractors --disable-dependency-tracking speeds up one-time build + --disable-valgrind Disable the use of valgrind in tests + --disable-tests Disable all tests + --disable-itc-test Disable ITC test + --disable-tuberia-test Disable Tuberia test Some influential environment variables: CC C compiler command @@ -1477,6 +1494,52 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + # ac_fn_c_try_cpp LINENO # ---------------------- # Try to preprocess conftest.$ac_ext, and return whether this succeeded. @@ -1674,52 +1737,6 @@ $as_echo "$ac_res" >&6; } } # ac_fn_c_check_header_compile -# ac_fn_c_try_link LINENO -# ----------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - test -x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_link - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -2142,6 +2159,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_headers="$ac_config_headers config.h" +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + am__api_version='1.16' @@ -4095,10 +4118,55 @@ unknown) ;; esac -AM_CFLAGS="-Wall -Werror" +AM_CFLAGS="-Wall -Wextra -Werror -pedantic" # Checks for libraries. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lpthread" >&5 +$as_echo_n "checking for pthread_self in -lpthread... " >&6; } +if ${ac_cv_lib_pthread_pthread_self+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpthread $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_self (); +int +main () +{ +return pthread_self (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pthread_pthread_self=yes +else + ac_cv_lib_pthread_pthread_self=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_self" >&5 +$as_echo "$ac_cv_lib_pthread_pthread_self" >&6; } +if test "x$ac_cv_lib_pthread_pthread_self" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBPTHREAD 1 +_ACEOF + + LIBS="-lpthread $LIBS" + +fi + # Checks for header files. ac_ext=c @@ -4515,6 +4583,73 @@ done # Checks for typedefs, structures, and compiler characteristics. # Checks for library functions. +for ac_header in stdlib.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STDLIB_H 1 +_ACEOF + +fi + +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 +$as_echo_n "checking for GNU libc compatible malloc... " >&6; } +if ${ac_cv_func_malloc_0_nonnull+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_func_malloc_0_nonnull=no +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined STDC_HEADERS || defined HAVE_STDLIB_H +# include +#else +char *malloc (); +#endif + +int +main () +{ +return ! malloc (0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_malloc_0_nonnull=yes +else + ac_cv_func_malloc_0_nonnull=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 +$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; } +if test $ac_cv_func_malloc_0_nonnull = yes; then : + +$as_echo "#define HAVE_MALLOC 1" >>confdefs.h + +else + $as_echo "#define HAVE_MALLOC 0" >>confdefs.h + + case " $LIBOBJS " in + *" malloc.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS malloc.$ac_objext" + ;; +esac + + +$as_echo "#define malloc rpl_malloc" >>confdefs.h + +fi + + for ac_func in gettimeofday do : ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" @@ -4527,7 +4662,114 @@ fi done -ac_config_files="$ac_config_files Makefile src/Makefile" +# Extract the first word of "valgrind", so it can be a program name with args. +set dummy valgrind; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_has_valgrind+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$has_valgrind"; then + ac_cv_prog_has_valgrind="$has_valgrind" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_has_valgrind="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_has_valgrind" && ac_cv_prog_has_valgrind="no" +fi +fi +has_valgrind=$ac_cv_prog_has_valgrind +if test -n "$has_valgrind"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_valgrind" >&5 +$as_echo "$has_valgrind" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + +# Check whether --enable-valgrind was given. +if test "${enable_valgrind+set}" = set; then : + enableval=$enable_valgrind; +else + enable_valgrind="yes" +fi + +# Check whether --enable-tests was given. +if test "${enable_tests+set}" = set; then : + enableval=$enable_tests; +else + enable_tests="yes" +fi + +# Check whether --enable-itc-test was given. +if test "${enable_itc_test+set}" = set; then : + enableval=$enable_itc_test; +else + enable_itc_test="yes" +fi + +# Check whether --enable-tuberia-test was given. +if test "${enable_tuberia_test+set}" = set; then : + enableval=$enable_tuberia_test; +else + enable_tuberia_test="yes" +fi + + +if test "x$has_valgrind" = xyes; then : + +else + enable_valgrind=no +fi + + if test x$enable_tests = xyes; then + TESTS_TRUE= + TESTS_FALSE='#' +else + TESTS_TRUE='#' + TESTS_FALSE= +fi + + if test x$enable_itc_test = xyes; then + ITCTEST_TRUE= + ITCTEST_FALSE='#' +else + ITCTEST_TRUE='#' + ITCTEST_FALSE= +fi + + if test x$enable_tuberia_test = xyes; then + TUBERIATEST_TRUE= + TUBERIATEST_FALSE='#' +else + TUBERIATEST_TRUE='#' + TUBERIATEST_FALSE= +fi + + if test x$enable_valgrind = xyes; then + VALGRIND_TRUE= + VALGRIND_FALSE='#' +else + VALGRIND_TRUE='#' + VALGRIND_FALSE= +fi + + +ac_config_files="$ac_config_files Makefile src/Makefile test/Makefile tuberia.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -4662,6 +4904,22 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${TESTS_TRUE}" && test -z "${TESTS_FALSE}"; then + as_fn_error $? "conditional \"TESTS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${ITCTEST_TRUE}" && test -z "${ITCTEST_FALSE}"; then + as_fn_error $? "conditional \"ITCTEST\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${TUBERIATEST_TRUE}" && test -z "${TUBERIATEST_FALSE}"; then + as_fn_error $? "conditional \"TUBERIATEST\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${VALGRIND_TRUE}" && test -z "${VALGRIND_FALSE}"; then + as_fn_error $? "conditional \"VALGRIND\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -5258,6 +5516,8 @@ do "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; + "tuberia.pc") CONFIG_FILES="$CONFIG_FILES tuberia.pc" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac @@ -5987,3 +6247,23 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: has valgrind: $has_valgrind" >&5 +$as_echo "$as_me: has valgrind: $has_valgrind" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: enable valgrind: $enable_valgrind" >&5 +$as_echo "$as_me: enable valgrind: $enable_valgrind" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: enable tests: $enable_tests" >&5 +$as_echo "$as_me: enable tests: $enable_tests" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: enable itc tests: $enable_itc_test" >&5 +$as_echo "$as_me: enable itc tests: $enable_itc_test" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: enable tuberia tests: $enable_tuberia_test" >&5 +$as_echo "$as_me: enable tuberia tests: $enable_tuberia_test" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: prefix: $prefix" >&5 +$as_echo "$as_me: prefix: $prefix" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: exec_prefix: $execprefix" >&5 +$as_echo "$as_me: exec_prefix: $execprefix" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: libdir: $libdir" >&5 +$as_echo "$as_me: libdir: $libdir" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: includedir: $includedir" >&5 +$as_echo "$as_me: includedir: $includedir" >&6;} + diff --git a/configure.ac b/configure.ac index 6932468..002d050 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,8 @@ AC_PREREQ([2.69]) AC_INIT([libtuberia], [1.0.0]) AC_CONFIG_SRCDIR([src/tuberia.c]) AC_CONFIG_HEADERS([config.h]) -AC_PREFIX_DEFAULT("/usr") +AC_PREFIX_DEFAULT([/usr]) +AC_LANG([C]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AM_SILENT_RULES([yes]) @@ -14,10 +15,11 @@ AM_SILENT_RULES([yes]) AC_PROG_CC AC_PROG_RANLIB AM_PROG_AR -AM_CFLAGS="-Wall -Werror" +AM_CFLAGS="-Wall -Wextra -Werror -pedantic" AC_SUBST([AM_CFLAGS]) # Checks for libraries. +AC_CHECK_LIB([pthread], [pthread_self]) # Checks for header files. AC_CHECK_HEADERS([stdlib.h sys/time.h]) @@ -25,8 +27,36 @@ AC_CHECK_HEADERS([stdlib.h sys/time.h]) # Checks for typedefs, structures, and compiler characteristics. # Checks for library functions. +AC_FUNC_MALLOC AC_CHECK_FUNCS([gettimeofday]) +AC_CHECK_PROG([has_valgrind], [valgrind], [yes], [no]) + +AC_ARG_ENABLE([valgrind], AS_HELP_STRING([--disable-valgrind], [Disable the use of valgrind in tests]), [], [enable_valgrind="yes"]) +AC_ARG_ENABLE([tests], AS_HELP_STRING([--disable-tests], [Disable all tests]), [], [enable_tests="yes"]) +AC_ARG_ENABLE([itc-test], AS_HELP_STRING([--disable-itc-test], [Disable ITC test]), [], [enable_itc_test="yes"]) +AC_ARG_ENABLE([tuberia-test], AS_HELP_STRING([--disable-tuberia-test], [Disable Tuberia test]), [], [enable_tuberia_test="yes"]) + +AS_VAR_IF([has_valgrind], [yes], [], [AS_VAR_SET([enable_valgrind], [no])]) + +AM_CONDITIONAL([TESTS], [test x$enable_tests = xyes]) +AM_CONDITIONAL([ITCTEST], [test x$enable_itc_test = xyes]) +AM_CONDITIONAL([TUBERIATEST], [test x$enable_tuberia_test = xyes]) +AM_CONDITIONAL([VALGRIND], [test x$enable_valgrind = xyes]) + AC_CONFIG_FILES([Makefile - src/Makefile]) + src/Makefile + test/Makefile + tuberia.pc]) AC_OUTPUT + +AC_MSG_NOTICE([has valgrind: $has_valgrind]) +AC_MSG_NOTICE([enable valgrind: $enable_valgrind]) +AC_MSG_NOTICE([enable tests: $enable_tests]) +AC_MSG_NOTICE([enable itc tests: $enable_itc_test]) +AC_MSG_NOTICE([enable tuberia tests: $enable_tuberia_test]) +AC_MSG_NOTICE([prefix: $prefix]) +AC_MSG_NOTICE([exec_prefix: $execprefix]) +AC_MSG_NOTICE([libdir: $libdir]) +AC_MSG_NOTICE([includedir: $includedir]) + diff --git a/src/Makefile.in b/src/Makefile.in index 7765882..e7f1714 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -263,6 +263,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +has_valgrind = @has_valgrind@ host_alias = @host_alias@ htmldir = @htmldir@ includedir = @includedir@ diff --git a/src/itc.c b/src/itc.c index 5b6fee9..e4698e8 100644 --- a/src/itc.c +++ b/src/itc.c @@ -37,7 +37,7 @@ void itc_free(itc **ctx, itc_free_element free_element) return; } - itc_drop(*ctx, free_element); + itc_discard_all(*ctx, free_element); sem_destroy(&(*ctx)->emptied); sem_destroy(&(*ctx)->occupied); @@ -71,7 +71,7 @@ int itc_inject(itc *ctx, int timeout_ms, void *element) { struct timespec ts; - if (ctx == NULL) { + if (ctx == NULL || element == NULL) { return -1; } @@ -87,7 +87,7 @@ int itc_inject(itc *ctx, int timeout_ms, void *element) return 0; } -void itc_flush(itc *ctx) +void itc_wait_empty(itc *ctx) { int i; @@ -97,11 +97,13 @@ void itc_flush(itc *ctx) for (i = 0; i < ctx->nslots; i++) { sem_wait(&ctx->emptied); + } + for (i = 0; i < ctx->nslots; i++) { sem_post(&ctx->emptied); } } -void itc_drop(itc *ctx, itc_free_element free_element) +void itc_discard_all(itc *ctx, itc_free_element free_element) { void *element; @@ -116,3 +118,21 @@ void itc_drop(itc *ctx, itc_free_element free_element) } } +int itc_get_queued(itc *ctx) +{ + int val; + if (ctx == NULL) { + return -1; + } + sem_getvalue(&ctx->occupied, &val); + return val; +} + +int itc_get_slots(itc *ctx) +{ + if (ctx == NULL) { + return -1; + } + return ctx->nslots; +} + diff --git a/src/itc.h b/src/itc.h index 01a0564..07dc03a 100644 --- a/src/itc.h +++ b/src/itc.h @@ -1,5 +1,5 @@ -#ifndef __LIBTUBERIA_ITC_H__ -#define __LIBTUBERIA_ITC_H__ +#ifndef LIBTUBERIA_ITC_H__ +#define LIBTUBERIA_ITC_H__ typedef struct itc itc; typedef void (*itc_free_element)(void *element); @@ -9,7 +9,10 @@ void itc_free(itc **ctx, itc_free_element free_element); void *itc_retrive(itc *ctx, int timeout_ms); int itc_inject(itc *ctx, int timeout_ms, void *element); -void itc_flush(itc *ctx); -void itc_drop(itc *ctx, itc_free_element free_element); +void itc_wait_empty(itc *ctx); +void itc_discard_all(itc *ctx, itc_free_element free_element); -#endif //__LIBTUBERIA_ITC_H__ +int itc_get_queued(itc *ctx); +int itc_get_slots(itc *ctx); + +#endif //LIBTUBERIA_ITC_H__ diff --git a/src/tuberia.c b/src/tuberia.c index 7e3a013..e6cd398 100644 --- a/src/tuberia.c +++ b/src/tuberia.c @@ -134,7 +134,7 @@ int tube_stage_append(tube_source *source, tube_stage *stage) return 0; } -tube *tube_create(tube_source *source, tube_sink sink, void *opaque) +tube *tube_alloc(const tube_source *source, tube_sink sink, void *opaque) { tube *ctx; struct tube_stage *s; @@ -250,7 +250,7 @@ int tube_start(tube *ctx) for (i = 0; i < ctx->nstages; i++) { if (!ctx->stages[i].run) { ctx->stages[i].run = 1; - pthread_create(&ctx->stages_thread[0], NULL, tube_stage_thread, &ctx->stages[i]); + pthread_create(&ctx->stages_thread[i], NULL, tube_stage_thread, &ctx->stages[i]); } } if (!ctx->fetch->run) { @@ -283,7 +283,7 @@ void *tube_retrive(tube *ctx, int timeout_ms) return itc_retrive(ctx->itcs[ctx->nitcs - 1], timeout_ms); } -void tube_flush(tube *ctx) +void tube_wait_empty(tube *ctx) { int i; @@ -292,11 +292,11 @@ void tube_flush(tube *ctx) } for (i = 0; i < ctx->nitcs; i++) { - itc_flush(ctx->itcs[i]); + itc_wait_empty(ctx->itcs[i]); } } -void tube_drop(tube *ctx) +void tube_discard_all(tube *ctx) { int i; @@ -305,7 +305,7 @@ void tube_drop(tube *ctx) } for (i = 0; i < ctx->nitcs; i++) { - itc_drop(ctx->itcs[i], ctx->free_element[i]); + itc_discard_all(ctx->itcs[i], ctx->free_element[i]); } } @@ -319,7 +319,7 @@ int tube_stop(tube *ctx) for (i = 0; i < ctx->nstages; i++) { if (ctx->stages[i].run) { ctx->stages[i].run = 0; - pthread_join(ctx->stages_thread[0], NULL); + pthread_join(ctx->stages_thread[i], NULL); } } if (ctx->fetch->run) { @@ -343,13 +343,15 @@ void tube_free(tube **ctx) return; } - tube_stop((*ctx)); + tube_stop(*ctx); for (i = 0; i < (*ctx)->nitcs; i++) { itc_free(&(*ctx)->itcs[i], (*ctx)->free_element[i]); } free((*ctx)->itcs); + free((*ctx)->free_element); free((*ctx)->stages); + free((*ctx)->stages_thread); free((*ctx)->fetch); free((*ctx)->sink); @@ -357,3 +359,19 @@ void tube_free(tube **ctx) *ctx = NULL; } +int tube_get_queued(const tube *ctx, int stage) +{ + if (ctx == NULL || stage < 0 || stage >= ctx->nstages) { + return -1; + } + return itc_get_queued(ctx->itcs[stage]); +} + +int tube_get_slots(const tube *ctx, int stage) +{ + if (ctx == NULL || stage < 0 || stage >= ctx->nitcs) { + return -1; + } + return itc_get_slots(ctx->itcs[stage]); +} + diff --git a/src/tuberia.h b/src/tuberia.h index d410bab..9b3c56c 100644 --- a/src/tuberia.h +++ b/src/tuberia.h @@ -1,5 +1,5 @@ -#ifndef __LIBTUBERIA_H__ -#define __LIBTUBERIA_H__ +#ifndef LIBTUBERIA_H__ +#define LIBTUBERIA_H__ typedef struct tube tube; typedef struct tube_source tube_source; @@ -17,15 +17,18 @@ void tube_source_and_stages_free(tube_source **source); int tube_stage_append(tube_source *source, tube_stage *stage); -tube *tube_create(tube_source *source, tube_sink sink, void *opaque); +tube *tube_alloc(const tube_source *source, tube_sink sink, void *opaque); int tube_start(tube *ctx); int tube_stop(tube *ctx); void tube_free(tube **ctx); int tube_inject(tube *ctx, int timeout_ms, void *element); void *tube_retrive(tube *ctx, int timeout_ms); -void tube_flush(tube *ctx); -void tube_drop(tube *ctx); +void tube_wait_empty(tube *ctx); +void tube_discard_all(tube *ctx); -#endif //__LIBTUBERIA_H__ +int tube_get_queued(const tube *ctx, int stage); +int tube_get_slots(const tube *ctx, int stage); + +#endif //LIBTUBERIA_H__ diff --git a/src/utils.h b/src/utils.h index a98763a..0fde429 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,10 +1,10 @@ -#ifndef __LIBTUBERIA_UTILS_H__ -#define __LIBTUBERIA_UTILS_H__ +#ifndef LIBTUBERIA_UTILS_H__ +#define LIBTUBERIA_UTILS_H__ #include struct timespec *timespec_add_ms(struct timespec *ts, int timeout_ms); struct timespec *gettimespec(struct timespec *ts); -#endif +#endif //LIBTUBERIA_UTILS_H__ diff --git a/test/Makefile.am b/test/Makefile.am new file mode 100644 index 0000000..4800141 --- /dev/null +++ b/test/Makefile.am @@ -0,0 +1,33 @@ +check_PROGRAMS = +TESTS = +check_HEADERS = test.h + +if TESTS + +if ITCTEST +check_PROGRAMS += test_itc +if VALGRIND +TESTS += test_itc_valgrind +else +TESTS += test_itc +endif +test_itc_SOURCES = test_itc.c test.h +test_itc_LDADD = ../src/libtuberia.a +test_itc_LDFLAGS = -lpthread +endif + +if TUBERIATEST +check_PROGRAMS += test_tuberia +if VALGRIND +TESTS += test_tuberia_valgrind +else +TESTS += test_tuberia +endif + +test_tuberia_SOURCES = test_tuberia.c test.h +test_tuberia_LDADD = ../src/libtuberia.a +test_tuberia_LDFLAGS = -lpthread +endif + +endif + diff --git a/test/Makefile.in b/test/Makefile.in new file mode 100644 index 0000000..72afc44 --- /dev/null +++ b/test/Makefile.in @@ -0,0 +1,963 @@ +# Makefile.in generated by automake 1.16.2 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2020 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) +TESTS = $(am__append_2) $(am__EXEEXT_3) $(am__append_5) \ + $(am__EXEEXT_4) +@ITCTEST_TRUE@@TESTS_TRUE@am__append_1 = test_itc +@ITCTEST_TRUE@@TESTS_TRUE@@VALGRIND_TRUE@am__append_2 = test_itc_valgrind +@ITCTEST_TRUE@@TESTS_TRUE@@VALGRIND_FALSE@am__append_3 = test_itc +@TESTS_TRUE@@TUBERIATEST_TRUE@am__append_4 = test_tuberia +@TESTS_TRUE@@TUBERIATEST_TRUE@@VALGRIND_TRUE@am__append_5 = test_tuberia_valgrind +@TESTS_TRUE@@TUBERIATEST_TRUE@@VALGRIND_FALSE@am__append_6 = test_tuberia +subdir = test +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(check_HEADERS) \ + $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +@ITCTEST_TRUE@@TESTS_TRUE@am__EXEEXT_1 = test_itc$(EXEEXT) +@TESTS_TRUE@@TUBERIATEST_TRUE@am__EXEEXT_2 = test_tuberia$(EXEEXT) +am__test_itc_SOURCES_DIST = test_itc.c test.h +@ITCTEST_TRUE@@TESTS_TRUE@am_test_itc_OBJECTS = test_itc.$(OBJEXT) +test_itc_OBJECTS = $(am_test_itc_OBJECTS) +@ITCTEST_TRUE@@TESTS_TRUE@test_itc_DEPENDENCIES = ../src/libtuberia.a +test_itc_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(test_itc_LDFLAGS) \ + $(LDFLAGS) -o $@ +am__test_tuberia_SOURCES_DIST = test_tuberia.c test.h +@TESTS_TRUE@@TUBERIATEST_TRUE@am_test_tuberia_OBJECTS = \ +@TESTS_TRUE@@TUBERIATEST_TRUE@ test_tuberia.$(OBJEXT) +test_tuberia_OBJECTS = $(am_test_tuberia_OBJECTS) +@TESTS_TRUE@@TUBERIATEST_TRUE@test_tuberia_DEPENDENCIES = \ +@TESTS_TRUE@@TUBERIATEST_TRUE@ ../src/libtuberia.a +test_tuberia_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(test_tuberia_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/test_itc.Po \ + ./$(DEPDIR)/test_tuberia.Po +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(test_itc_SOURCES) $(test_tuberia_SOURCES) +DIST_SOURCES = $(am__test_itc_SOURCES_DIST) \ + $(am__test_tuberia_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +@ITCTEST_TRUE@@TESTS_TRUE@@VALGRIND_FALSE@am__EXEEXT_3 = \ +@ITCTEST_TRUE@@TESTS_TRUE@@VALGRIND_FALSE@ test_itc$(EXEEXT) +@TESTS_TRUE@@TUBERIATEST_TRUE@@VALGRIND_FALSE@am__EXEEXT_4 = test_tuberia$(EXEEXT) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/test-driver +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_CFLAGS = @AM_CFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build_alias = @build_alias@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +has_valgrind = @has_valgrind@ +host_alias = @host_alias@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +check_HEADERS = test.h +@ITCTEST_TRUE@@TESTS_TRUE@test_itc_SOURCES = test_itc.c test.h +@ITCTEST_TRUE@@TESTS_TRUE@test_itc_LDADD = ../src/libtuberia.a +@ITCTEST_TRUE@@TESTS_TRUE@test_itc_LDFLAGS = -lpthread +@TESTS_TRUE@@TUBERIATEST_TRUE@test_tuberia_SOURCES = test_tuberia.c test.h +@TESTS_TRUE@@TUBERIATEST_TRUE@test_tuberia_LDADD = ../src/libtuberia.a +@TESTS_TRUE@@TUBERIATEST_TRUE@test_tuberia_LDFLAGS = -lpthread +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign test/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +clean-checkPROGRAMS: + -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS) + +test_itc$(EXEEXT): $(test_itc_OBJECTS) $(test_itc_DEPENDENCIES) $(EXTRA_test_itc_DEPENDENCIES) + @rm -f test_itc$(EXEEXT) + $(AM_V_CCLD)$(test_itc_LINK) $(test_itc_OBJECTS) $(test_itc_LDADD) $(LIBS) + +test_tuberia$(EXEEXT): $(test_tuberia_OBJECTS) $(test_tuberia_DEPENDENCIES) $(EXTRA_test_tuberia_DEPENDENCIES) + @rm -f test_tuberia$(EXEEXT) + $(AM_V_CCLD)$(test_tuberia_LINK) $(test_tuberia_OBJECTS) $(test_tuberia_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_itc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_tuberia.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ + fi; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ + else \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ + fi; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ + else \ + color_start= color_end=; \ + fi; \ + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: $(check_PROGRAMS) $(check_HEADERS) + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) $(check_HEADERS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +test_itc_valgrind.log: test_itc_valgrind + @p='test_itc_valgrind'; \ + b='test_itc_valgrind'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test_itc.log: test_itc$(EXEEXT) + @p='test_itc$(EXEEXT)'; \ + b='test_itc'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test_tuberia_valgrind.log: test_tuberia_valgrind + @p='test_tuberia_valgrind'; \ + b='test_tuberia_valgrind'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test_tuberia.log: test_tuberia$(EXEEXT) + @p='test_tuberia$(EXEEXT)'; \ + b='test_tuberia'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_HEADERS) + $(MAKE) $(AM_MAKEFLAGS) check-TESTS +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-checkPROGRAMS clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f ./$(DEPDIR)/test_itc.Po + -rm -f ./$(DEPDIR)/test_tuberia.Po + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f ./$(DEPDIR)/test_itc.Po + -rm -f ./$(DEPDIR)/test_tuberia.Po + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: check-am install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \ + check-am clean clean-checkPROGRAMS clean-generic cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/test/test.h b/test/test.h new file mode 100644 index 0000000..096470d --- /dev/null +++ b/test/test.h @@ -0,0 +1,9 @@ +#ifndef LIBTUBERIA_TEST_H__ +#define LIBTUBERIA_TEST_H__ + +#include +#include + +#define TEST(a) do { int ret = (a); fprintf(stderr, "%4s %15s:%-4d %-40s : %-40s\n", ret ? "OK" : "FAIL", __FILE__, __LINE__, __func__, # a); if(!ret) { abort(); } } while(0); + +#endif //LIBTUBERIA_TEST_H__ diff --git a/test/test_itc.c b/test/test_itc.c new file mode 100644 index 0000000..ba96114 --- /dev/null +++ b/test/test_itc.c @@ -0,0 +1,171 @@ +#include "../src/itc.h" +#include "test.h" + +#include +#include +#include + +static void test_itc_alloc_free(void) +{ + itc *ctx; + TEST((ctx = itc_alloc(0)) == NULL); + TEST((ctx = itc_alloc(1)) != NULL); + itc_free(&ctx, NULL); + TEST(ctx == NULL); +} + +static void test_itc_inject_retrive(void) +{ + unsigned int i; + unsigned int *e[3] = {NULL}; + int *r; + itc *ctx; + + for (i = 0; i < sizeof(e)/sizeof(e[0]); i++) { + e[i] = malloc(sizeof(*e[i])); + *e[i] = i; + } + + ctx = itc_alloc(3); + TEST(itc_inject(ctx, 0, e[0]) == 0); + TEST(itc_inject(ctx, 0, e[1]) == 0); + TEST(itc_inject(ctx, 0, e[2]) == 0); + TEST((r = itc_retrive(ctx, 0)) != NULL); + TEST(*r == 0); + TEST((r = itc_retrive(ctx, 0)) != NULL); + TEST(*r == 1); + TEST(itc_inject(ctx, 0, e[0]) == 0); + TEST(itc_inject(ctx, 0, e[1]) == 0); + TEST((r = itc_retrive(ctx, 0)) != NULL); + TEST(*r == 2); + TEST((r = itc_retrive(ctx, 0)) != NULL); + TEST(*r == 0); + TEST((r = itc_retrive(ctx, 0)) != NULL); + TEST(*r == 1); + TEST(itc_retrive(ctx, 0) == NULL); + TEST(itc_inject(ctx, 0, e[0]) == 0); + itc_free(&ctx, free); + + e[0] = malloc(sizeof(*e[0])); + *e[0] = 0; + ctx = itc_alloc(2); + TEST(itc_inject(ctx, 0, e[0]) == 0); + TEST(itc_inject(ctx, 0, e[1]) == 0); + TEST(itc_inject(ctx, 0, e[2])); + TEST((r = itc_retrive(ctx, 0)) != NULL); + TEST(*r == 0); + TEST((r = itc_retrive(ctx, 0)) != NULL); + TEST(*r == 1); + TEST(itc_retrive(ctx, 0) == NULL); + itc_free(&ctx, free); + for (i = 0; i < sizeof(e)/sizeof(e[0]); i++) { + free(e[i]); + } +} + +static void test_itc_queued_slots(void) +{ + itc *ctx; + ctx = itc_alloc(3); + TEST(itc_get_queued(NULL) < 0); + TEST(itc_get_queued(ctx) == 0); + TEST(itc_get_slots(NULL) < 0); + TEST(itc_get_slots(ctx) == 3); + itc_inject(ctx, 0, NULL); + TEST(itc_get_queued(ctx) == 0); + TEST(itc_get_slots(ctx) == 3); + itc_inject(ctx, 0, ctx); + TEST(itc_get_queued(ctx) == 1); + TEST(itc_get_slots(ctx) == 3); + itc_inject(ctx, 0, ctx); + TEST(itc_get_queued(ctx) == 2); + TEST(itc_get_slots(ctx) == 3); + itc_retrive(ctx, 0); + TEST(itc_get_queued(ctx) == 1); + TEST(itc_get_slots(ctx) == 3); + itc_retrive(ctx, 0); + TEST(itc_get_queued(ctx) == 0); + TEST(itc_get_slots(ctx) == 3); + itc_free(&ctx, NULL); +} + +static void *test_itc_wait_empty_th(void *_ctx) +{ + itc *ctx = _ctx; + int *e; + + sleep(1); + TEST(ctx != NULL); + TEST((e = itc_retrive(ctx, 0)) != NULL); + TEST(*e == 0); + free(e); + TEST((e = itc_retrive(ctx, 0)) != NULL); + TEST(*e == 1); + free(e); + TEST((e = itc_retrive(ctx, 0)) != NULL); + TEST(*e == 2); + free(e); + TEST(itc_retrive(ctx, 0) == NULL); + + return NULL; +} + +static void test_itc_wait_empty(void) +{ + itc *ctx; + pthread_t th; + int *e[3]; + int i; + + for (i = 0; i < 3; i++) { + e[i] = malloc(sizeof(int)); + *e[i] = i; + } + + ctx = itc_alloc(3); + itc_inject(ctx, 0, e[0]); + itc_inject(ctx, 0, e[1]); + itc_inject(ctx, 0, e[2]); + pthread_create(&th, NULL, test_itc_wait_empty_th, ctx); + pthread_detach(th); + itc_wait_empty(ctx); + TEST(itc_get_queued(ctx) == 0); + TEST(itc_retrive(ctx, 0) == NULL); + itc_free(&ctx, NULL); +} + +static void test_itc_discard_all(void) +{ + itc *ctx; + unsigned int *e[4]; + unsigned int i; + + for (i = 0; i < sizeof(e)/sizeof(e[0]); i++) { + e[i] = malloc(sizeof(*e[i])); + *e[i] = i; + } + + ctx = itc_alloc(5); + itc_discard_all(ctx, free); + TEST(itc_get_queued(ctx) == 0); + itc_inject(ctx, 0, e[0]); + itc_inject(ctx, 0, e[1]); + itc_inject(ctx, 0, e[2]); + itc_inject(ctx, 0, e[3]); + itc_discard_all(ctx, free); + TEST(itc_get_queued(ctx) == 0); + itc_free(&ctx, NULL); +} + +int main(int argc, char **argv) +{ + (void)argc; + (void)argv; + test_itc_alloc_free(); + test_itc_inject_retrive(); + test_itc_queued_slots(); + test_itc_wait_empty(); + test_itc_discard_all(); + return 0; +} + diff --git a/test/test_itc_valgrind b/test/test_itc_valgrind new file mode 100755 index 0000000..eeace9a --- /dev/null +++ b/test/test_itc_valgrind @@ -0,0 +1,3 @@ +#!/bin/sh + +valgrind --error-exitcode=1 --leak-check=yes --show-reachable=yes ./test_itc diff --git a/test/test_tuberia.c b/test/test_tuberia.c new file mode 100644 index 0000000..8856447 --- /dev/null +++ b/test/test_tuberia.c @@ -0,0 +1,110 @@ +#include "../src/tuberia.h" +#include "test.h" + +#include +#include + +static void *process(void *element, void *opaque) +{ + unsigned int *e = element; + unsigned int *r; + int *s = opaque; + r = malloc(sizeof(*r)); + *r = *e + *s; + free(e); + return r; +} + +static void test_tube_source_stage_alloc_free(void) +{ + tube_source *source; + tube_stage *stage; + TEST((source = tube_source_alloc(0, NULL, NULL, free)) == NULL); + TEST((source = tube_source_alloc(1, NULL, NULL, free)) != NULL); + tube_source_and_stages_free(&source); + TEST(source == NULL); + TEST((source = tube_source_alloc(3, NULL, NULL, free)) != NULL); + tube_source_and_stages_free(&source); + TEST(source == NULL); + TEST((stage = tube_stage_alloc(0, NULL, NULL, free)) == NULL); + TEST((stage = tube_stage_alloc(3, NULL, NULL, free)) == NULL); + TEST((stage = tube_stage_alloc(0, process, NULL, free)) == NULL); + TEST((stage = tube_stage_alloc(1, process, NULL, free)) != NULL); + tube_stage_free(&stage); + TEST(stage == NULL); + TEST((stage = tube_stage_alloc(3, process, NULL, free)) != NULL); + tube_stage_free(&stage); + TEST(stage == NULL); + TEST((source = tube_source_alloc(1, NULL, NULL, free)) != NULL); + TEST(tube_stage_append(source, tube_stage_alloc(1, process, NULL, free)) == 0); + TEST(tube_stage_append(source, tube_stage_alloc(1, process, NULL, free)) == 0); + TEST(tube_stage_append(source, tube_stage_alloc(1, process, NULL, free)) == 0); + tube_source_and_stages_free(&source); + TEST(source == NULL); +} + +static void test_tube_alloc_free(void) +{ + tube *tube; + tube_source *source; + source = tube_source_alloc(1, NULL, NULL, free); + tube_stage_append(source, tube_stage_alloc(1, process, NULL, free)); + tube_stage_append(source, tube_stage_alloc(1, process, NULL, free)); + tube_stage_append(source, tube_stage_alloc(1, process, NULL, free)); + TEST((tube = tube_alloc(NULL, NULL, NULL)) == NULL); + TEST((tube = tube_alloc(source, NULL, NULL)) != NULL); + tube_source_and_stages_free(&source); + tube_free(&tube); + TEST(tube == NULL); +} + +static void test_tube_inject_retrive(void) +{ + tube *tube; + tube_source *source; + int sum[] = {7, 5}; + unsigned int *e[10]; + unsigned int r[10] = {12, 13, 14, 15, 16, 17, 18, 19, 20, 21}; + unsigned int *o; + unsigned int i; + + source = tube_source_alloc(3, NULL, NULL, free); + tube_stage_append(source, tube_stage_alloc(2, process, &sum[0], free)); + tube_stage_append(source, tube_stage_alloc(4, process, &sum[1], free)); + tube = tube_alloc(source, NULL, NULL); + tube_source_and_stages_free(&source); + + for (i = 0; i < sizeof(e)/sizeof(e[0]); i++) { + e[i] = malloc(sizeof(*e[i])); + *e[i] = i; + } + for (i = 0; i < 3; i++) { + TEST(tube_inject(tube, 1000, e[i]) == 0); + } + TEST(tube_inject(tube, 1000, e[i]) < 0); + TEST(tube_start(tube) == 0); + for (; i < sizeof(e)/sizeof(e[0]); i++) { + TEST(tube_inject(tube, 1000, e[i]) == 0); + } + for (i = 0; i < sizeof(e)/sizeof(e[0]); i++) { + TEST((o = tube_retrive(tube, 1000)) != NULL); + TEST(*o == r[i]); + free(o); + } + tube_free(&tube); +} + +int main(int argc, char **argv) +{ + (void)argc; + (void)argv; + test_tube_source_stage_alloc_free(); + test_tube_alloc_free(); + test_tube_inject_retrive(); + /*test_tube_get_queued(); + test_tube_get_slots(); + test_tube_wait_empty(); + test_tube_discard_all();*/ + return 0; +} + diff --git a/test/test_tuberia_valgrind b/test/test_tuberia_valgrind new file mode 100755 index 0000000..0593634 --- /dev/null +++ b/test/test_tuberia_valgrind @@ -0,0 +1,3 @@ +#!/bin/sh + +valgrind --error-exitcode=1 --leak-check=yes --show-reachable=yes ./test_tuberia diff --git a/tuberia.pc.in b/tuberia.pc.in new file mode 100644 index 0000000..26369ba --- /dev/null +++ b/tuberia.pc.in @@ -0,0 +1,11 @@ +# @configure_input@ +prefix=@prefix@ +exec_prefix=${prefix} +libdir=@libdir@ +includedir=@includedir@ + +Name: libtuberia +Description: Pipeline library +Libs: -L${libdir} -ltuberia +Libs.private: -lpthread +Cflags: -I${includedir} -- cgit v1.2.3