From dbe6ade0ba17270b2cb119b9961bbb7e48ce4733 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 16 Jul 2020 15:09:45 -0400 Subject: [PATCH] Cleanup: separate tests between 'unit' and 'compile' Change-Id: Ib4326540609dc464b9a89ba9b891cf9c410d902b Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- .gitignore | 22 ++++++++-------- configure.ac | 24 ++++++++++-------- tests/Makefile.am | 16 +++++------- tests/compile/Makefile.am | 11 ++++++++ tests/{ => compile}/ctf-types/Makefile.am | 0 tests/{ => compile}/ctf-types/README | 0 tests/{ => compile}/ctf-types/ctf-types.c | 0 tests/{ => compile}/ctf-types/tp.c | 0 .../ctf-types/ust_tests_ctf_types.h | 0 tests/{ => compile}/hello-many/Makefile.am | 0 tests/{ => compile}/hello-many/README | 0 tests/{ => compile}/hello-many/hello-many.c | 0 tests/{ => compile}/hello-many/tp.c | 0 .../hello-many/ust_tests_hello_many.h | 0 tests/{ => compile}/hello.cxx/Makefile.am | 0 tests/{ => compile}/hello.cxx/README | 0 tests/{ => compile}/hello.cxx/hello.cpp | 0 tests/{ => compile}/hello.cxx/tp-cpp.cpp | 0 .../{ => compile}/hello.cxx/ust_tests_hello.h | 0 tests/{ => compile}/hello/Makefile.am | 0 .../{ => compile}/hello/Makefile.example.bsd | 0 .../hello/Makefile.example.linux | 0 tests/{ => compile}/hello/README | 0 tests/{ => compile}/hello/hello.c | 0 tests/{ => compile}/hello/tp.c | 0 tests/{ => compile}/hello/ust_tests_hello.h | 0 .../same_line_tracepoint/Makefile.am | 0 .../{ => compile}/same_line_tracepoint/README | 0 .../same_line_tracepoint.c | 0 .../same_line_tracepoint/ust_tests_sameline.h | 0 tests/{ => compile}/test-app-ctx/Makefile.am | 0 tests/{ => compile}/test-app-ctx/hello.c | 0 tests/{ => compile}/test-app-ctx/tp.c | 0 .../test-app-ctx/ust_tests_hello.h | 0 tests/unit/Makefile.am | 5 ++++ tests/{ => unit}/gcc-weak-hidden/Makefile.am | 0 tests/{ => unit}/gcc-weak-hidden/b.c | 0 tests/{ => unit}/gcc-weak-hidden/c.c | 0 tests/{ => unit}/gcc-weak-hidden/d.c | 0 tests/{ => unit}/gcc-weak-hidden/main.c | 0 tests/{ => unit}/pthread_name/Makefile.am | 0 tests/{ => unit}/pthread_name/pthread_name.c | 0 tests/{ => unit}/snprintf/Makefile.am | 0 tests/{ => unit}/snprintf/README | 0 tests/{ => unit}/snprintf/snprintf.c | 0 tests/{ => unit}/ust-elf/Makefile.am | 0 tests/{ => unit}/ust-elf/README.md | 0 .../ust-elf/data/aarch64_be/main.elf | Bin .../ust-elf/data/aarch64_be/main.elf.debug | Bin tests/{ => unit}/ust-elf/data/armeb/main.elf | Bin .../ust-elf/data/armeb/main.elf.debug | Bin tests/{ => unit}/ust-elf/data/main.c | 0 tests/{ => unit}/ust-elf/data/pic/hello.c | 0 tests/{ => unit}/ust-elf/data/pic/hello.exec | Bin tests/{ => unit}/ust-elf/data/pic/hello.pic | Bin tests/{ => unit}/ust-elf/data/pic/hello.pie | Bin tests/{ => unit}/ust-elf/data/pic/libhello.c | 0 tests/{ => unit}/ust-elf/data/x86/main.elf | Bin .../ust-elf/data/x86/main.elf.debug | Bin tests/{ => unit}/ust-elf/data/x86_64/main.elf | Bin .../ust-elf/data/x86_64/main.elf.debug | Bin tests/unit/ust-elf/test_ust_elf.in | 4 +++ tests/{ => unit}/ust-elf/ust-elf.c | 0 tests/ust-elf/test_ust_elf.in | 4 --- 64 files changed, 50 insertions(+), 36 deletions(-) create mode 100644 tests/compile/Makefile.am rename tests/{ => compile}/ctf-types/Makefile.am (100%) rename tests/{ => compile}/ctf-types/README (100%) rename tests/{ => compile}/ctf-types/ctf-types.c (100%) rename tests/{ => compile}/ctf-types/tp.c (100%) rename tests/{ => compile}/ctf-types/ust_tests_ctf_types.h (100%) rename tests/{ => compile}/hello-many/Makefile.am (100%) rename tests/{ => compile}/hello-many/README (100%) rename tests/{ => compile}/hello-many/hello-many.c (100%) rename tests/{ => compile}/hello-many/tp.c (100%) rename tests/{ => compile}/hello-many/ust_tests_hello_many.h (100%) rename tests/{ => compile}/hello.cxx/Makefile.am (100%) rename tests/{ => compile}/hello.cxx/README (100%) rename tests/{ => compile}/hello.cxx/hello.cpp (100%) rename tests/{ => compile}/hello.cxx/tp-cpp.cpp (100%) rename tests/{ => compile}/hello.cxx/ust_tests_hello.h (100%) rename tests/{ => compile}/hello/Makefile.am (100%) rename tests/{ => compile}/hello/Makefile.example.bsd (100%) rename tests/{ => compile}/hello/Makefile.example.linux (100%) rename tests/{ => compile}/hello/README (100%) rename tests/{ => compile}/hello/hello.c (100%) rename tests/{ => compile}/hello/tp.c (100%) rename tests/{ => compile}/hello/ust_tests_hello.h (100%) rename tests/{ => compile}/same_line_tracepoint/Makefile.am (100%) rename tests/{ => compile}/same_line_tracepoint/README (100%) rename tests/{ => compile}/same_line_tracepoint/same_line_tracepoint.c (100%) rename tests/{ => compile}/same_line_tracepoint/ust_tests_sameline.h (100%) rename tests/{ => compile}/test-app-ctx/Makefile.am (100%) rename tests/{ => compile}/test-app-ctx/hello.c (100%) rename tests/{ => compile}/test-app-ctx/tp.c (100%) rename tests/{ => compile}/test-app-ctx/ust_tests_hello.h (100%) create mode 100644 tests/unit/Makefile.am rename tests/{ => unit}/gcc-weak-hidden/Makefile.am (100%) rename tests/{ => unit}/gcc-weak-hidden/b.c (100%) rename tests/{ => unit}/gcc-weak-hidden/c.c (100%) rename tests/{ => unit}/gcc-weak-hidden/d.c (100%) rename tests/{ => unit}/gcc-weak-hidden/main.c (100%) rename tests/{ => unit}/pthread_name/Makefile.am (100%) rename tests/{ => unit}/pthread_name/pthread_name.c (100%) rename tests/{ => unit}/snprintf/Makefile.am (100%) rename tests/{ => unit}/snprintf/README (100%) rename tests/{ => unit}/snprintf/snprintf.c (100%) rename tests/{ => unit}/ust-elf/Makefile.am (100%) rename tests/{ => unit}/ust-elf/README.md (100%) rename tests/{ => unit}/ust-elf/data/aarch64_be/main.elf (100%) rename tests/{ => unit}/ust-elf/data/aarch64_be/main.elf.debug (100%) rename tests/{ => unit}/ust-elf/data/armeb/main.elf (100%) rename tests/{ => unit}/ust-elf/data/armeb/main.elf.debug (100%) rename tests/{ => unit}/ust-elf/data/main.c (100%) rename tests/{ => unit}/ust-elf/data/pic/hello.c (100%) rename tests/{ => unit}/ust-elf/data/pic/hello.exec (100%) rename tests/{ => unit}/ust-elf/data/pic/hello.pic (100%) rename tests/{ => unit}/ust-elf/data/pic/hello.pie (100%) rename tests/{ => unit}/ust-elf/data/pic/libhello.c (100%) rename tests/{ => unit}/ust-elf/data/x86/main.elf (100%) rename tests/{ => unit}/ust-elf/data/x86/main.elf.debug (100%) rename tests/{ => unit}/ust-elf/data/x86_64/main.elf (100%) rename tests/{ => unit}/ust-elf/data/x86_64/main.elf.debug (100%) create mode 100644 tests/unit/ust-elf/test_ust_elf.in rename tests/{ => unit}/ust-elf/ust-elf.c (100%) delete mode 100644 tests/ust-elf/test_ust_elf.in diff --git a/.gitignore b/.gitignore index c81a6ca1..f34fd050 100644 --- a/.gitignore +++ b/.gitignore @@ -70,19 +70,19 @@ doc/man/tracef.3 doc/man/tracelog.3 doc/man/vtracef.3 -tests/hello/hello -tests/hello-many/hello-many -tests/hello.cxx/hello -tests/same_line_tracepoint/same_line_tracepoint -tests/snprintf/test_snprintf -tests/ust-elf/ust-elf -tests/ust-elf/test_ust_elf tests/benchmark/bench1 tests/benchmark/bench2 -tests/ctf-types/ctf-types -tests/test-app-ctx/hello -tests/gcc-weak-hidden/test_gcc_weak_hidden -tests/pthread_name/test_pthread_name +tests/compile/ctf-types/ctf-types +tests/compile/hello.cxx/hello +tests/compile/hello/hello +tests/compile/hello-many/hello-many +tests/compile/same_line_tracepoint/same_line_tracepoint +tests/compile/test-app-ctx/hello +tests/unit/gcc-weak-hidden/test_gcc_weak_hidden +tests/unit/pthread_name/test_pthread_name +tests/unit/snprintf/test_snprintf +tests/unit/ust-elf/test_ust_elf +tests/unit/ust-elf/ust-elf # Java agent library *.class diff --git a/configure.ac b/configure.ac index 586affc9..d409072a 100644 --- a/configure.ac +++ b/configure.ac @@ -566,18 +566,20 @@ AC_CONFIG_FILES([ python-lttngust/lttngust/__init__.py tools/Makefile tests/Makefile - tests/ctf-types/Makefile - tests/hello/Makefile - tests/hello-many/Makefile - tests/hello.cxx/Makefile - tests/same_line_tracepoint/Makefile - tests/snprintf/Makefile - tests/ust-elf/Makefile + tests/compile/Makefile + tests/compile/ctf-types/Makefile + tests/compile/hello.cxx/Makefile + tests/compile/hello/Makefile + tests/compile/hello-many/Makefile + tests/compile/same_line_tracepoint/Makefile + tests/compile/test-app-ctx/Makefile tests/benchmark/Makefile - tests/pthread_name/Makefile + tests/unit/gcc-weak-hidden/Makefile + tests/unit/Makefile + tests/unit/pthread_name/Makefile + tests/unit/snprintf/Makefile + tests/unit/ust-elf/Makefile tests/utils/Makefile - tests/test-app-ctx/Makefile - tests/gcc-weak-hidden/Makefile lttng-ust.pc lttng-ust-ctl.pc ]) @@ -591,7 +593,7 @@ AC_CONFIG_LINKS([ python-lttngust/lttngust/loghandler.py:python-lttngust/lttngust/loghandler.py ]) -AC_CONFIG_FILES([tests/ust-elf/test_ust_elf],[chmod +x tests/ust-elf/test_ust_elf]) +AC_CONFIG_FILES([tests/unit/ust-elf/test_ust_elf],[chmod +x tests/unit/ust-elf/test_ust_elf]) AC_OUTPUT diff --git a/tests/Makefile.am b/tests/Makefile.am index d46c94a5..204925c1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,18 +1,14 @@ -SUBDIRS = utils hello same_line_tracepoint snprintf benchmark ust-elf \ - ctf-types test-app-ctx gcc-weak-hidden hello-many pthread_name - -if CXX_WORKS -SUBDIRS += hello.cxx -endif +SUBDIRS = utils unit compile benchmark LOG_DRIVER_FLAGS='--merge' LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ $(top_srcdir)/config/tap-driver.sh -TESTS = snprintf/test_snprintf \ - ust-elf/test_ust_elf \ - gcc-weak-hidden/test_gcc_weak_hidden \ - pthread_name/test_pthread_name +TESTS = \ + unit/gcc-weak-hidden/test_gcc_weak_hidden \ + unit/pthread_name/test_pthread_name \ + unit/snprintf/test_snprintf \ + unit/ust-elf/test_ust_elf EXTRA_DIST = README diff --git a/tests/compile/Makefile.am b/tests/compile/Makefile.am new file mode 100644 index 00000000..04f44433 --- /dev/null +++ b/tests/compile/Makefile.am @@ -0,0 +1,11 @@ +SUBDIRS = \ + ctf-types \ + hello \ + hello-many \ + same_line_tracepoint \ + test-app-ctx + +if CXX_WORKS +SUBDIRS += hello.cxx +endif + diff --git a/tests/ctf-types/Makefile.am b/tests/compile/ctf-types/Makefile.am similarity index 100% rename from tests/ctf-types/Makefile.am rename to tests/compile/ctf-types/Makefile.am diff --git a/tests/ctf-types/README b/tests/compile/ctf-types/README similarity index 100% rename from tests/ctf-types/README rename to tests/compile/ctf-types/README diff --git a/tests/ctf-types/ctf-types.c b/tests/compile/ctf-types/ctf-types.c similarity index 100% rename from tests/ctf-types/ctf-types.c rename to tests/compile/ctf-types/ctf-types.c diff --git a/tests/ctf-types/tp.c b/tests/compile/ctf-types/tp.c similarity index 100% rename from tests/ctf-types/tp.c rename to tests/compile/ctf-types/tp.c diff --git a/tests/ctf-types/ust_tests_ctf_types.h b/tests/compile/ctf-types/ust_tests_ctf_types.h similarity index 100% rename from tests/ctf-types/ust_tests_ctf_types.h rename to tests/compile/ctf-types/ust_tests_ctf_types.h diff --git a/tests/hello-many/Makefile.am b/tests/compile/hello-many/Makefile.am similarity index 100% rename from tests/hello-many/Makefile.am rename to tests/compile/hello-many/Makefile.am diff --git a/tests/hello-many/README b/tests/compile/hello-many/README similarity index 100% rename from tests/hello-many/README rename to tests/compile/hello-many/README diff --git a/tests/hello-many/hello-many.c b/tests/compile/hello-many/hello-many.c similarity index 100% rename from tests/hello-many/hello-many.c rename to tests/compile/hello-many/hello-many.c diff --git a/tests/hello-many/tp.c b/tests/compile/hello-many/tp.c similarity index 100% rename from tests/hello-many/tp.c rename to tests/compile/hello-many/tp.c diff --git a/tests/hello-many/ust_tests_hello_many.h b/tests/compile/hello-many/ust_tests_hello_many.h similarity index 100% rename from tests/hello-many/ust_tests_hello_many.h rename to tests/compile/hello-many/ust_tests_hello_many.h diff --git a/tests/hello.cxx/Makefile.am b/tests/compile/hello.cxx/Makefile.am similarity index 100% rename from tests/hello.cxx/Makefile.am rename to tests/compile/hello.cxx/Makefile.am diff --git a/tests/hello.cxx/README b/tests/compile/hello.cxx/README similarity index 100% rename from tests/hello.cxx/README rename to tests/compile/hello.cxx/README diff --git a/tests/hello.cxx/hello.cpp b/tests/compile/hello.cxx/hello.cpp similarity index 100% rename from tests/hello.cxx/hello.cpp rename to tests/compile/hello.cxx/hello.cpp diff --git a/tests/hello.cxx/tp-cpp.cpp b/tests/compile/hello.cxx/tp-cpp.cpp similarity index 100% rename from tests/hello.cxx/tp-cpp.cpp rename to tests/compile/hello.cxx/tp-cpp.cpp diff --git a/tests/hello.cxx/ust_tests_hello.h b/tests/compile/hello.cxx/ust_tests_hello.h similarity index 100% rename from tests/hello.cxx/ust_tests_hello.h rename to tests/compile/hello.cxx/ust_tests_hello.h diff --git a/tests/hello/Makefile.am b/tests/compile/hello/Makefile.am similarity index 100% rename from tests/hello/Makefile.am rename to tests/compile/hello/Makefile.am diff --git a/tests/hello/Makefile.example.bsd b/tests/compile/hello/Makefile.example.bsd similarity index 100% rename from tests/hello/Makefile.example.bsd rename to tests/compile/hello/Makefile.example.bsd diff --git a/tests/hello/Makefile.example.linux b/tests/compile/hello/Makefile.example.linux similarity index 100% rename from tests/hello/Makefile.example.linux rename to tests/compile/hello/Makefile.example.linux diff --git a/tests/hello/README b/tests/compile/hello/README similarity index 100% rename from tests/hello/README rename to tests/compile/hello/README diff --git a/tests/hello/hello.c b/tests/compile/hello/hello.c similarity index 100% rename from tests/hello/hello.c rename to tests/compile/hello/hello.c diff --git a/tests/hello/tp.c b/tests/compile/hello/tp.c similarity index 100% rename from tests/hello/tp.c rename to tests/compile/hello/tp.c diff --git a/tests/hello/ust_tests_hello.h b/tests/compile/hello/ust_tests_hello.h similarity index 100% rename from tests/hello/ust_tests_hello.h rename to tests/compile/hello/ust_tests_hello.h diff --git a/tests/same_line_tracepoint/Makefile.am b/tests/compile/same_line_tracepoint/Makefile.am similarity index 100% rename from tests/same_line_tracepoint/Makefile.am rename to tests/compile/same_line_tracepoint/Makefile.am diff --git a/tests/same_line_tracepoint/README b/tests/compile/same_line_tracepoint/README similarity index 100% rename from tests/same_line_tracepoint/README rename to tests/compile/same_line_tracepoint/README diff --git a/tests/same_line_tracepoint/same_line_tracepoint.c b/tests/compile/same_line_tracepoint/same_line_tracepoint.c similarity index 100% rename from tests/same_line_tracepoint/same_line_tracepoint.c rename to tests/compile/same_line_tracepoint/same_line_tracepoint.c diff --git a/tests/same_line_tracepoint/ust_tests_sameline.h b/tests/compile/same_line_tracepoint/ust_tests_sameline.h similarity index 100% rename from tests/same_line_tracepoint/ust_tests_sameline.h rename to tests/compile/same_line_tracepoint/ust_tests_sameline.h diff --git a/tests/test-app-ctx/Makefile.am b/tests/compile/test-app-ctx/Makefile.am similarity index 100% rename from tests/test-app-ctx/Makefile.am rename to tests/compile/test-app-ctx/Makefile.am diff --git a/tests/test-app-ctx/hello.c b/tests/compile/test-app-ctx/hello.c similarity index 100% rename from tests/test-app-ctx/hello.c rename to tests/compile/test-app-ctx/hello.c diff --git a/tests/test-app-ctx/tp.c b/tests/compile/test-app-ctx/tp.c similarity index 100% rename from tests/test-app-ctx/tp.c rename to tests/compile/test-app-ctx/tp.c diff --git a/tests/test-app-ctx/ust_tests_hello.h b/tests/compile/test-app-ctx/ust_tests_hello.h similarity index 100% rename from tests/test-app-ctx/ust_tests_hello.h rename to tests/compile/test-app-ctx/ust_tests_hello.h diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am new file mode 100644 index 00000000..8c14ffbb --- /dev/null +++ b/tests/unit/Makefile.am @@ -0,0 +1,5 @@ +SUBDIRS = \ + gcc-weak-hidden \ + pthread_name \ + snprintf \ + ust-elf diff --git a/tests/gcc-weak-hidden/Makefile.am b/tests/unit/gcc-weak-hidden/Makefile.am similarity index 100% rename from tests/gcc-weak-hidden/Makefile.am rename to tests/unit/gcc-weak-hidden/Makefile.am diff --git a/tests/gcc-weak-hidden/b.c b/tests/unit/gcc-weak-hidden/b.c similarity index 100% rename from tests/gcc-weak-hidden/b.c rename to tests/unit/gcc-weak-hidden/b.c diff --git a/tests/gcc-weak-hidden/c.c b/tests/unit/gcc-weak-hidden/c.c similarity index 100% rename from tests/gcc-weak-hidden/c.c rename to tests/unit/gcc-weak-hidden/c.c diff --git a/tests/gcc-weak-hidden/d.c b/tests/unit/gcc-weak-hidden/d.c similarity index 100% rename from tests/gcc-weak-hidden/d.c rename to tests/unit/gcc-weak-hidden/d.c diff --git a/tests/gcc-weak-hidden/main.c b/tests/unit/gcc-weak-hidden/main.c similarity index 100% rename from tests/gcc-weak-hidden/main.c rename to tests/unit/gcc-weak-hidden/main.c diff --git a/tests/pthread_name/Makefile.am b/tests/unit/pthread_name/Makefile.am similarity index 100% rename from tests/pthread_name/Makefile.am rename to tests/unit/pthread_name/Makefile.am diff --git a/tests/pthread_name/pthread_name.c b/tests/unit/pthread_name/pthread_name.c similarity index 100% rename from tests/pthread_name/pthread_name.c rename to tests/unit/pthread_name/pthread_name.c diff --git a/tests/snprintf/Makefile.am b/tests/unit/snprintf/Makefile.am similarity index 100% rename from tests/snprintf/Makefile.am rename to tests/unit/snprintf/Makefile.am diff --git a/tests/snprintf/README b/tests/unit/snprintf/README similarity index 100% rename from tests/snprintf/README rename to tests/unit/snprintf/README diff --git a/tests/snprintf/snprintf.c b/tests/unit/snprintf/snprintf.c similarity index 100% rename from tests/snprintf/snprintf.c rename to tests/unit/snprintf/snprintf.c diff --git a/tests/ust-elf/Makefile.am b/tests/unit/ust-elf/Makefile.am similarity index 100% rename from tests/ust-elf/Makefile.am rename to tests/unit/ust-elf/Makefile.am diff --git a/tests/ust-elf/README.md b/tests/unit/ust-elf/README.md similarity index 100% rename from tests/ust-elf/README.md rename to tests/unit/ust-elf/README.md diff --git a/tests/ust-elf/data/aarch64_be/main.elf b/tests/unit/ust-elf/data/aarch64_be/main.elf similarity index 100% rename from tests/ust-elf/data/aarch64_be/main.elf rename to tests/unit/ust-elf/data/aarch64_be/main.elf diff --git a/tests/ust-elf/data/aarch64_be/main.elf.debug b/tests/unit/ust-elf/data/aarch64_be/main.elf.debug similarity index 100% rename from tests/ust-elf/data/aarch64_be/main.elf.debug rename to tests/unit/ust-elf/data/aarch64_be/main.elf.debug diff --git a/tests/ust-elf/data/armeb/main.elf b/tests/unit/ust-elf/data/armeb/main.elf similarity index 100% rename from tests/ust-elf/data/armeb/main.elf rename to tests/unit/ust-elf/data/armeb/main.elf diff --git a/tests/ust-elf/data/armeb/main.elf.debug b/tests/unit/ust-elf/data/armeb/main.elf.debug similarity index 100% rename from tests/ust-elf/data/armeb/main.elf.debug rename to tests/unit/ust-elf/data/armeb/main.elf.debug diff --git a/tests/ust-elf/data/main.c b/tests/unit/ust-elf/data/main.c similarity index 100% rename from tests/ust-elf/data/main.c rename to tests/unit/ust-elf/data/main.c diff --git a/tests/ust-elf/data/pic/hello.c b/tests/unit/ust-elf/data/pic/hello.c similarity index 100% rename from tests/ust-elf/data/pic/hello.c rename to tests/unit/ust-elf/data/pic/hello.c diff --git a/tests/ust-elf/data/pic/hello.exec b/tests/unit/ust-elf/data/pic/hello.exec similarity index 100% rename from tests/ust-elf/data/pic/hello.exec rename to tests/unit/ust-elf/data/pic/hello.exec diff --git a/tests/ust-elf/data/pic/hello.pic b/tests/unit/ust-elf/data/pic/hello.pic similarity index 100% rename from tests/ust-elf/data/pic/hello.pic rename to tests/unit/ust-elf/data/pic/hello.pic diff --git a/tests/ust-elf/data/pic/hello.pie b/tests/unit/ust-elf/data/pic/hello.pie similarity index 100% rename from tests/ust-elf/data/pic/hello.pie rename to tests/unit/ust-elf/data/pic/hello.pie diff --git a/tests/ust-elf/data/pic/libhello.c b/tests/unit/ust-elf/data/pic/libhello.c similarity index 100% rename from tests/ust-elf/data/pic/libhello.c rename to tests/unit/ust-elf/data/pic/libhello.c diff --git a/tests/ust-elf/data/x86/main.elf b/tests/unit/ust-elf/data/x86/main.elf similarity index 100% rename from tests/ust-elf/data/x86/main.elf rename to tests/unit/ust-elf/data/x86/main.elf diff --git a/tests/ust-elf/data/x86/main.elf.debug b/tests/unit/ust-elf/data/x86/main.elf.debug similarity index 100% rename from tests/ust-elf/data/x86/main.elf.debug rename to tests/unit/ust-elf/data/x86/main.elf.debug diff --git a/tests/ust-elf/data/x86_64/main.elf b/tests/unit/ust-elf/data/x86_64/main.elf similarity index 100% rename from tests/ust-elf/data/x86_64/main.elf rename to tests/unit/ust-elf/data/x86_64/main.elf diff --git a/tests/ust-elf/data/x86_64/main.elf.debug b/tests/unit/ust-elf/data/x86_64/main.elf.debug similarity index 100% rename from tests/ust-elf/data/x86_64/main.elf.debug rename to tests/unit/ust-elf/data/x86_64/main.elf.debug diff --git a/tests/unit/ust-elf/test_ust_elf.in b/tests/unit/ust-elf/test_ust_elf.in new file mode 100644 index 00000000..280180ce --- /dev/null +++ b/tests/unit/ust-elf/test_ust_elf.in @@ -0,0 +1,4 @@ +#!/bin/sh + +TEST_DIR=$(dirname "$0") +"${TEST_DIR}/ust-elf" "@abs_top_srcdir@/tests/unit/ust-elf" diff --git a/tests/ust-elf/ust-elf.c b/tests/unit/ust-elf/ust-elf.c similarity index 100% rename from tests/ust-elf/ust-elf.c rename to tests/unit/ust-elf/ust-elf.c diff --git a/tests/ust-elf/test_ust_elf.in b/tests/ust-elf/test_ust_elf.in deleted file mode 100644 index f4a3017f..00000000 --- a/tests/ust-elf/test_ust_elf.in +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -TEST_DIR=$(dirname "$0") -"${TEST_DIR}/ust-elf" "@abs_top_srcdir@/tests/ust-elf" -- 2.34.1