testcases: realtime: Get rid of autotools
PATCH 1/1 testcases: realtime: Get rid of autotools
The autotools checks are outdated and not needed anymore.
(untested but should work fine)
--- testcases/realtime/Makefile | 64 +------------------------- testcases/realtime/configure.ac | 42 ----------------- testcases/realtime/include/librttest.h | 9 +--- testcases/realtime/lib/libstats.c | 6 --- testcases/realtime/m4/.gitignore | 1 - testcases/realtime/m4/GNUmakefile | 37 --------------- testcases/realtime/m4/Makefile.am | 1 - testcases/realtime/m4/check.m4 | 14 ------ 8 files changed, 2 insertions(+), 172 deletions(-) delete mode 100644 testcases/realtime/configure.ac delete mode 100644 testcases/realtime/m4/.gitignore delete mode 100644 testcases/realtime/m4/GNUmakefile delete mode 100644 testcases/realtime/m4/Makefile.am delete mode 100644 testcases/realtime/m4/check.m4
testcases/realtime/Makefile +1 -63
@@ -22,74 +22,12 @@ top_srcdir ?= ../.. -# Override these variables to use non-system available tools. -ACLOCAL ?= aclocal -AUTOCONF ?= autoconf -AUTOHEADER ?= autoheader -AUTOMAKE ?= automake - include $(top_srcdir)/include/mk/env_pre.mk -# Ensure that this error / warning only applies for build targets. -# -# NOTE (garrcoop): this criterium should be in-sync with include/mk/env_pre.mk -# (minus help as that's only invoked in the top-level Makefile). -ifeq ($(filter autotools %clean .gitignore gitignore.%,$(MAKECMDGOALS)),) -include $(abs_srcdir)/config.mk -endif LIBDIR := lib -FILTER_OUT_DIRS := $(LIBDIR) m4 +FILTER_OUT_DIRS := $(LIBDIR) LIB := $(LIBDIR)/librealtime.a -# START autotools junk -AUTOGENERATED_FILES = \ - m4/Makefile - -AUTOMAKE_FILES := config.guess config.sub install-sh missing stamp-h1 - -.PHONY: autotools aclocal autoconf autoheader automake -autotools: aclocal autoconf autoheader automake - -.PHONY: ac-clean ac-distclean ac-maintainer-clean -ac-clean:: - $(RM) -rf autom4te.cache - $(RM) -f aclocal.m4 config.log config.status - $(RM) -f include/realtime_config.h include/stamp-h1 - -ac-distclean:: ac-clean -ac-maintainer-clean:: ac-distclean - $(RM) -f aclocal.m4 configure $(AUTOMAKE_FILES) m4/Makefile.in - $(RM) -f include/realtime_config.h.in - -aclocal.m4: - $(ACLOCAL) -I $(abs_srcdir)/m4 - -autoconf: configure - -include/realtime_config.h.in: configure.ac $(wildcard m4/*.m4) aclocal.m4 - $(AUTOHEADER) - -configure: configure.ac aclocal.m4 - $(AUTOCONF) -automake: $(AUTOMAKE_FILES) -$(AUTOMAKE_FILES): m4/Makefile.in -m4/Makefile.in: m4/Makefile.am aclocal.m4 - $(AUTOMAKE) -c -a - -.PHONY: autoheader -autoheader: include/realtime_config.h.in - $(AUTOHEADER) - -distclean:: %: clean ac-distclean - $(RM) -f $(AUTOGENERATED_FILES) - -maintainer-clean:: distclean ac-maintainer-clean - -$(AUTOGENERATED_FILES): $(top_builddir)/config.status - $(SHELL) $^ - -# END autotools junk - $(LIBDIR): mkdir -p "$@"
testcases/realtime/configure.ac deleted +0 -42
42 lines not on this page · raw message
testcases/realtime/include/librttest.h +1 -8
@@ -56,7 +56,6 @@#include <time.h> #include <unistd.h> #include "list.h" -#include "realtime_config.h" extern void setup (void );extern void cleanup (int i);
@@ -113,15 +112,9 @@ extern double pass_criteria;*/ static inline int atomic_add (int i,atomic_t *v) { -/* XXX (garrcoop): only available in later versions of gcc */ -#if HAVE___SYNC_ADD_AND_FETCH return __sync_add_and_fetch (&v->counter, i); -#else -printf ("%s: %s\n" , __func__,strerror (ENOSYS )); -exit (1 ); -return -1 ; -#endif } +/* atomic_inc: atomically increment the integer passed by reference */ static inline int atomic_inc (atomic_t *v)
testcases/realtime/lib/libstats.c +0 -6
@@ -46,12 +46,6 @@#include <libstats.h> #include <librttest.h> -#include "../include/realtime_config.h" - -#ifndef HAVE_EXP10 -# define exp10 (x) (exp((x) * log(10))) -#endif -int save_stats =0 ;/* static helper functions */
testcases/realtime/m4/.gitignore deleted +0 -1
@@ -1 +0,0 @@ -/Makefile
testcases/realtime/m4/GNUmakefile deleted +0 -37
@@ -1,37 +0,0 @@ -# -# m4 Makefile. -# -# Copyright (C) 2009, Cisco Systems Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Ngie Cooper, July 2009 -# - -top_srcdir ?= ../../.. - -include $(top_srcdir)/include/mk/env_pre.mk - -M4MACROS := $(notdir $(wildcard *.m4)) - -INSTALL_DIR := $(datarootdir)/aclocal - -INSTALL_MODE := 00644 - -INSTALL_TARGETS := $(M4_MACROS) - -MAKE_TARGETS := - -include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/realtime/m4/Makefile.am deleted +0 -1
@@ -1 +0,0 @@ -# bogus makefile to appease automake
testcases/realtime/m4/check.m4 deleted +0 -14
@@ -1,14 +0,0 @@ -AC_DEFUN([REALTIME_CHECK_PRIO_INHERIT],[ -AC_MSG_CHECKING([for PTHREAD_PRIO_INHERIT]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include <pthread.h>]], [[int main(void) { - pthread_mutexattr_t attr; - return pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT); -}]])],[has_priority_inherit="yes"],[]) -if test "x$has_priority_inherit" = "xyes" ; then - AC_DEFINE(HAS_PRIORITY_INHERIT,1,[Define to 1 if you have PTHREAD_PRIO_INHERIT]) - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi -])
Signature · 5 lines
2.43.2 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Cyril Hrubis <[email protected]> wrote:
The autotools checks are outdated and not needed anymore.
Quoted 4 lines
(untested but should work fine)
Signed-off-by Cyril Hrubis <[email protected]>
Quoted 16 lines
--- testcases/realtime/Makefile | 64 +------------------------- testcases/realtime/configure.ac | 42 ----------------- testcases/realtime/include/librttest.h | 9 +--- testcases/realtime/lib/libstats.c | 6 --- testcases/realtime/m4/.gitignore | 1 - testcases/realtime/m4/GNUmakefile | 37 --------------- testcases/realtime/m4/Makefile.am | 1 - testcases/realtime/m4/check.m4 | 14 ------ 8 files changed, 2 insertions(+), 172 deletions(-) delete mode 100644 testcases/realtime/configure.ac delete mode 100644 testcases/realtime/m4/.gitignore delete mode 100644 testcases/realtime/m4/GNUmakefile delete mode 100644 testcases/realtime/m4/Makefile.am delete mode 100644 testcases/realtime/m4/check.m4
Seems we have to remove the related line in automake.mk as well, otherwise build broken in 'make -C testcases/realtime autotools'.
include/mk/automake.mk +0 -1
@@ -27,7 +27,6 @@ AUTOHEADER ?= autoheader AUTOMAKE ?= automake AUTOCONFED_SUBDIRS = \ - testcases/realtime \ testcases/open_posix_testsuite
Signature · 5 lines
Regards, Li Wang -- Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 31 lines · Li Wang
Cyril Hrubis <[email protected]> wrote:
The autotools checks are outdated and not needed anymore.
Quoted 4 lines
(untested but should work fine)
Signed-off-by Cyril Hrubis <[email protected]>Quoted 16 lines
--- testcases/realtime/Makefile | 64 +------------------------- testcases/realtime/configure.ac | 42 ----------------- testcases/realtime/include/librttest.h | 9 +--- testcases/realtime/lib/libstats.c | 6 --- testcases/realtime/m4/.gitignore | 1 - testcases/realtime/m4/GNUmakefile | 37 --------------- testcases/realtime/m4/Makefile.am | 1 - testcases/realtime/m4/check.m4 | 14 ------ 8 files changed, 2 insertions(+), 172 deletions(-) delete mode 100644 testcases/realtime/configure.ac delete mode 100644 testcases/realtime/m4/.gitignore delete mode 100644 testcases/realtime/m4/GNUmakefile delete mode 100644 testcases/realtime/m4/Makefile.am delete mode 100644 testcases/realtime/m4/check.m4Seems we have to remove the related line in automake.mk as well, otherwise build broken in 'make -C testcases/realtime autotools'.
include/mk/automake.mk AUTOHEADER ?= autoheader · line 31
Quoted 6 lines
include/mk/automake.mk +0
-1@@ -27,7 +27,6 @@ AUTOHEADER ?= autoheader AUTOMAKE ?= automake AUTOCONFED_SUBDIRS = \ - testcases/realtime \ testcases/open_posix_testsuite
Ah, includes more lines related below:
include/mk/automake.mk +0 -1
@@ -27,15 +27,10 @@ AUTOHEADER ?= autoheader AUTOMAKE ?= automake AUTOCONFED_SUBDIRS = \ - testcases/realtime \ testcases/open_posix_testsuite # We want to run this every single time to ensure that all of the prereq
files
# are there.
-.PHONY: testcases/realtime/configure
-testcases/realtime/configure:
- $(MAKE) -C $(@D) autotools
-
.PHONY: testcases/open_posix_testsuite/configure
testcases/open_posix_testsuite/configure:
$(MAKE) -C $(@D) autotoolsSignature · 5 lines
Regards, Li Wang -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Cyril,
great idea, thanks!
Looking at Li's notes, could you please push the final result to the CI? (pushing the branch to your fork + enable CI in
https://github.com/metan-ucw/ltp/actions).
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp