From 8a00021b2ab5529640e5acaca30a27cdaca04178 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Wed, 13 Jul 2016 16:10:28 +0200 Subject: Integrate tests into autotools build system Add automake files for the test binaries. If configured to do so, install the test binaries to libexec/mtd-utils and use autoconf to fix the paths in the test scripts. Signed-off-by: David Oberhollenzer Signed-off-by: Richard Weinberger --- tests/fs-tests/Makefile | 8 --- tests/fs-tests/Makemodule.am | 86 +++++++++++++++++++++++++++++++++ tests/fs-tests/fs_help_all.sh.in | 33 +++++++++++++ tests/fs-tests/fs_run_all.sh.in | 51 +++++++++++++++++++ tests/fs-tests/help_all.sh | 27 ----------- tests/fs-tests/integrity/Makefile | 31 ------------ tests/fs-tests/lib/Makefile | 18 ------- tests/fs-tests/run_all.sh | 49 ------------------- tests/fs-tests/simple/Makefile | 30 ------------ tests/fs-tests/stress/Makefile | 11 ----- tests/fs-tests/stress/atoms/Makefile | 40 --------------- tests/fs-tests/stress/fs_stress00.sh.in | 58 ++++++++++++++++++++++ tests/fs-tests/stress/fs_stress01.sh.in | 46 ++++++++++++++++++ tests/fs-tests/stress/stress00.sh | 52 -------------------- tests/fs-tests/stress/stress01.sh | 40 --------------- tests/fs-tests/utils/Makefile | 19 -------- 16 files changed, 274 insertions(+), 325 deletions(-) delete mode 100644 tests/fs-tests/Makefile create mode 100644 tests/fs-tests/Makemodule.am create mode 100755 tests/fs-tests/fs_help_all.sh.in create mode 100755 tests/fs-tests/fs_run_all.sh.in delete mode 100755 tests/fs-tests/help_all.sh delete mode 100644 tests/fs-tests/integrity/Makefile delete mode 100644 tests/fs-tests/lib/Makefile delete mode 100755 tests/fs-tests/run_all.sh delete mode 100644 tests/fs-tests/simple/Makefile delete mode 100644 tests/fs-tests/stress/Makefile delete mode 100644 tests/fs-tests/stress/atoms/Makefile create mode 100755 tests/fs-tests/stress/fs_stress00.sh.in create mode 100755 tests/fs-tests/stress/fs_stress01.sh.in delete mode 100755 tests/fs-tests/stress/stress00.sh delete mode 100755 tests/fs-tests/stress/stress01.sh delete mode 100644 tests/fs-tests/utils/Makefile (limited to 'tests/fs-tests') diff --git a/tests/fs-tests/Makefile b/tests/fs-tests/Makefile deleted file mode 100644 index d188796..0000000 --- a/tests/fs-tests/Makefile +++ /dev/null @@ -1,8 +0,0 @@ - -SUBDIRS = lib simple stress integrity utils - -all clean tests: $(SUBDIRS) - -.PHONY: $(SUBDIRS) -$(SUBDIRS): - $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/tests/fs-tests/Makemodule.am b/tests/fs-tests/Makemodule.am new file mode 100644 index 0000000..031355a --- /dev/null +++ b/tests/fs-tests/Makemodule.am @@ -0,0 +1,86 @@ +integck_SOURCES = tests/fs-tests/integrity/integck.c +integck_LDADD = libubi.a +integck_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include + +test_1_SOURCES = tests/fs-tests/simple/test_1.c tests/fs-tests/lib/tests.c +test_1_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib + +test_2_SOURCES = tests/fs-tests/simple/test_2.c tests/fs-tests/lib/tests.c +test_2_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib + +ftrunc_SOURCES = tests/fs-tests/simple/ftrunc.c tests/fs-tests/lib/tests.c +ftrunc_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib + +perf_SOURCES = tests/fs-tests/simple/perf.c tests/fs-tests/lib/tests.c +perf_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib + +orph_SOURCES = tests/fs-tests/simple/orph.c tests/fs-tests/lib/tests.c +orph_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib + +stress_1_SOURCES = tests/fs-tests/stress/atoms/stress_1.c +stress_1_SOURCES += tests/fs-tests/lib/tests.c +stress_1_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib + +stress_2_SOURCES = tests/fs-tests/stress/atoms/stress_2.c +stress_2_SOURCES += tests/fs-tests/lib/tests.c +stress_2_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib + +stress_3_SOURCES = tests/fs-tests/stress/atoms/stress_3.c +stress_3_SOURCES += tests/fs-tests/lib/tests.c +stress_3_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib + +pdfrun_SOURCES = tests/fs-tests/stress/atoms/pdfrun.c +pdfrun_SOURCES += tests/fs-tests/lib/tests.c +pdfrun_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib + +rndwrite00_SOURCES = tests/fs-tests/stress/atoms/rndwrite00.c +rndwrite00_SOURCES += tests/fs-tests/lib/tests.c +rndwrite00_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib + +fwrite00_SOURCES = tests/fs-tests/stress/atoms/fwrite00.c +fwrite00_SOURCES += tests/fs-tests/lib/tests.c +fwrite00_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib + +rmdir00_SOURCES = tests/fs-tests/stress/atoms/rmdir00.c +rmdir00_SOURCES += tests/fs-tests/lib/tests.c +rmdir00_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib + +rndrm00_SOURCES = tests/fs-tests/stress/atoms/rndrm00.c +rndrm00_SOURCES += tests/fs-tests/lib/tests.c +rndrm00_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib + +rndrm99_SOURCES = tests/fs-tests/stress/atoms/rndrm99.c +rndrm99_SOURCES += tests/fs-tests/lib/tests.c +rndrm99_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib + +gcd_hupper_SOURCES = tests/fs-tests/stress/atoms/gcd_hupper.c +gcd_hupper_SOURCES += tests/fs-tests/lib/tests.c +gcd_hupper_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/fs-tests/lib + +fstest_monitor_SOURCES = tests/fs-tests/utils/fstest_monitor.c + +free_space_SOURCES = tests/fs-tests/utils/free_space.c + +FSTEST_BINS = \ + integck test_1 test_2 ftrunc perf orph \ + stress_1 stress_2 stress_3 pdfrun gcd_hupper \ + rndwrite00 fwrite00 rmdir00 rndrm00 rndrm99 \ + fstest_monitor free_space + +FSTEST_SH = \ + tests/fs-tests/fs_help_all.sh tests/fs-tests/fs_run_all.sh \ + tests/fs-tests/stress/fs_stress00.sh \ + tests/fs-tests/stress/fs_stress01.sh + +FSTEST_HEADER = \ + tests/fs-tests/lib/tests.h + +EXTRA_DIST += $(FSTEST_HEADER) + +if INSTALL_TESTS +pkglibexec_SCRIPTS += $(FSTEST_SH) +pkglibexec_PROGRAMS += $(FSTEST_BINS) +else +noinst_SCRIPTS += $(FSTEST_SH) +noinst_PROGRAMS += $(FSTEST_BINS) +endif diff --git a/tests/fs-tests/fs_help_all.sh.in b/tests/fs-tests/fs_help_all.sh.in new file mode 100755 index 0000000..39219b2 --- /dev/null +++ b/tests/fs-tests/fs_help_all.sh.in @@ -0,0 +1,33 @@ +#!/bin/sh + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +libexecpath=@libexecdir@/mtd-utils +TESTBINDIR=@testbindir@ + +echo ------------------------------------------------------------------------------- +$TESTBINDIR/test_1 -h +echo ------------------------------------------------------------------------------- +$TESTBINDIR/test_2 -h +echo ------------------------------------------------------------------------------- +$TESTBINDIR/stress_1 -h +echo ------------------------------------------------------------------------------- +$TESTBINDIR/stress_2 -h +echo ------------------------------------------------------------------------------- +$TESTBINDIR/stress_3 -h +echo ------------------------------------------------------------------------------- +$TESTBINDIR/fwrite00 -h +echo ------------------------------------------------------------------------------- +$TESTBINDIR/gcd_hupper -h +echo ------------------------------------------------------------------------------- +$TESTBINDIR/pdfrun -h +echo ------------------------------------------------------------------------------- +$TESTBINDIR/rmdir00 -h +echo ------------------------------------------------------------------------------- +$TESTBINDIR/rndrm00 -h +echo ------------------------------------------------------------------------------- +$TESTBINDIR/rndwrite00 -h +echo ------------------------------------------------------------------------------- +$TESTBINDIR/integck -h +echo ------------------------------------------------------------------------------- diff --git a/tests/fs-tests/fs_run_all.sh.in b/tests/fs-tests/fs_run_all.sh.in new file mode 100755 index 0000000..a3676f9 --- /dev/null +++ b/tests/fs-tests/fs_run_all.sh.in @@ -0,0 +1,51 @@ +#!/bin/sh + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +libexecpath=@libexecdir@/mtd-utils +TESTBINDIR=@testbindir@ + +TEST_DIR=$TEST_FILE_SYSTEM_MOUNT_DIR +if test -z "$TEST_DIR"; +then + TEST_DIR="/mnt/test_file_system" +fi + +rm -rf ${TEST_DIR}/* + +$TESTBINDIR/test_1 || exit 1 + +rm -rf ${TEST_DIR}/* + +$TESTBINDIR/test_2 || exit 1 + +rm -rf ${TEST_DIR}/* + +$TESTBINDIR/integck $TEST_DIR || exit 1 + +rm -rf ${TEST_DIR}/* + +$TESTBINDIR/rndrm00 -z0 || exit 1 + +rm -rf ${TEST_DIR}/* + +$TESTBINDIR/rmdir00 -z0 || exit 1 + +rm -rf ${TEST_DIR}/* + +$TESTBINDIR/stress_1 -z10000000 -e || exit 1 + +rm -rf ${TEST_DIR}/* + +$TESTBINDIR/stress_2 -z10000000 || exit 1 + +rm -rf ${TEST_DIR}/* + +$TESTBINDIR/stress_3 -z1000000000 -e || exit 1 + +rm -rf ${TEST_DIR}/* + +$TESTBINDIR/fs_stress00.sh 360 || exit 1 + +$TESTBINDIR/fs_stress01.sh 360 || exit 1 diff --git a/tests/fs-tests/help_all.sh b/tests/fs-tests/help_all.sh deleted file mode 100755 index 34b890b..0000000 --- a/tests/fs-tests/help_all.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -echo ------------------------------------------------------------------------------- -./simple/test_1 -h -echo ------------------------------------------------------------------------------- -./simple/test_2 -h -echo ------------------------------------------------------------------------------- -./stress/atoms/stress_1 -h -echo ------------------------------------------------------------------------------- -./stress/atoms/stress_2 -h -echo ------------------------------------------------------------------------------- -./stress/atoms/stress_3 -h -echo ------------------------------------------------------------------------------- -./stress/atoms/fwrite00 -h -echo ------------------------------------------------------------------------------- -./stress/atoms/gcd_hupper -h -echo ------------------------------------------------------------------------------- -./stress/atoms/pdfrun -h -echo ------------------------------------------------------------------------------- -./stress/atoms/rmdir00 -h -echo ------------------------------------------------------------------------------- -./stress/atoms/rndrm00 -h -echo ------------------------------------------------------------------------------- -./stress/atoms/rndwrite00 -h -echo ------------------------------------------------------------------------------- -./integrity/integck -h -echo ------------------------------------------------------------------------------- diff --git a/tests/fs-tests/integrity/Makefile b/tests/fs-tests/integrity/Makefile deleted file mode 100644 index b64bad9..0000000 --- a/tests/fs-tests/integrity/Makefile +++ /dev/null @@ -1,31 +0,0 @@ - -ifeq ($(origin CC),default) -CC = gcc -endif - -COMMON_HEADERS_DIR := ../../../include -LIBUBI_PATH = ../../../ubi-utils/ -LIBUBI_HEADER_PATH = $(LIBUBI_PATH)/include - -CFLAGS := $(CFLAGS) -Wall -g -O2 -I$(COMMON_HEADERS_DIR) -I$(LIBUBI_HEADER_PATH) - -LDFLAGS := $(LDFLAGS) - -TARGETS = integck - -all: $(TARGETS) - -# Compile ubilib -libubi.a: - $(CC) $(CFLAGS) -c $(LIBUBI_PATH)/libubi.c -o libubi.o - $(AR) cr libubi.a libubi.o - -$(TARGETS): libubi.a - -# Disable optimizations to make it possible to use gdb comfortably -# Use -rdynamic to have stack backtraces -debug: libubi.a - $(CC) $(CFLAGS) -O0 -D INTEGCK_DEBUG -rdynamic integck.c libubi.a -o integck - -clean: - rm -f *.o $(TARGETS) libubi.a diff --git a/tests/fs-tests/lib/Makefile b/tests/fs-tests/lib/Makefile deleted file mode 100644 index 8d57824..0000000 --- a/tests/fs-tests/lib/Makefile +++ /dev/null @@ -1,18 +0,0 @@ - -ifeq ($(origin CC),default) -CC = gcc -endif - -CFLAGS := $(CFLAGS) -Wall -g -O2 - -LDFLAGS := $(LDFLAGS) - -all: tests.o - -tests.o: tests.h - -clean: - rm -f *.o - -tests: - echo diff --git a/tests/fs-tests/run_all.sh b/tests/fs-tests/run_all.sh deleted file mode 100755 index 7c82f9a..0000000 --- a/tests/fs-tests/run_all.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh - -TEST_DIR=$TEST_FILE_SYSTEM_MOUNT_DIR -if test -z "$TEST_DIR"; -then - TEST_DIR="/mnt/test_file_system" -fi - -rm -rf ${TEST_DIR}/* - -./simple/test_1 || exit 1 - -rm -rf ${TEST_DIR}/* - -./simple/test_2 || exit 1 - -rm -rf ${TEST_DIR}/* - -./integrity/integck $TEST_DIR || exit 1 - -rm -rf ${TEST_DIR}/* - -./stress/atoms/rndrm00 -z0 || exit 1 - -rm -rf ${TEST_DIR}/* - -./stress/atoms/rmdir00 -z0 || exit 1 - -rm -rf ${TEST_DIR}/* - -./stress/atoms/stress_1 -z10000000 -e || exit 1 - -rm -rf ${TEST_DIR}/* - -./stress/atoms/stress_2 -z10000000 || exit 1 - -rm -rf ${TEST_DIR}/* - -./stress/atoms/stress_3 -z1000000000 -e || exit 1 - -rm -rf ${TEST_DIR}/* - -cd stress || exit 1 - -./stress00.sh 360 || exit 1 - -./stress01.sh 360 || exit 1 - -cd .. || exit 1 diff --git a/tests/fs-tests/simple/Makefile b/tests/fs-tests/simple/Makefile deleted file mode 100644 index d447da3..0000000 --- a/tests/fs-tests/simple/Makefile +++ /dev/null @@ -1,30 +0,0 @@ - -ifeq ($(origin CC),default) -CC = gcc -endif - -CFLAGS := $(CFLAGS) -Wall -g -O2 -I../lib - -LDFLAGS := $(LDFLAGS) - -TARGETS = test_1 \ - test_2 \ - ftrunc \ - orph \ - perf - -all: $(TARGETS) - -$(TARGETS): ../lib/tests.o - -../lib/tests.o: ../lib/tests.h - -clean: - rm -f *.o $(TARGETS) - -tests: all - ./test_1 --sync - ./test_2 --sync - ./ftrunc - ./orph --sync - ./perf diff --git a/tests/fs-tests/stress/Makefile b/tests/fs-tests/stress/Makefile deleted file mode 100644 index c24ff3f..0000000 --- a/tests/fs-tests/stress/Makefile +++ /dev/null @@ -1,11 +0,0 @@ - -SUBDIRS = atoms - -all tests: $(SUBDIRS) - -clean: $(SUBDIRS) - rm -rf run_pdf_test_file_* - -.PHONY: $(SUBDIRS) -$(SUBDIRS): - $(MAKE) -C $@ $(MAKECMDGOALS) diff --git a/tests/fs-tests/stress/atoms/Makefile b/tests/fs-tests/stress/atoms/Makefile deleted file mode 100644 index 9fbfd39..0000000 --- a/tests/fs-tests/stress/atoms/Makefile +++ /dev/null @@ -1,40 +0,0 @@ - -ifeq ($(origin CC),default) -CC = gcc -endif - -CFLAGS := $(CFLAGS) -Wall -g -O2 -I../../lib - -LDFLAGS := $(LDFLAGS) - -TARGETS = stress_1 \ - stress_2 \ - stress_3 \ - pdfrun \ - rndwrite00 \ - fwrite00 \ - rmdir00 \ - rndrm00 \ - rndrm99 \ - gcd_hupper - -all: $(TARGETS) - -$(TARGETS): ../../lib/tests.o - -../lib/tests.o: ../../lib/tests.h - -clean: - rm -f *.o $(TARGETS) run_pdf_test_file - -tests: all - ./stress_1 -e - ./stress_2 - ./stress_3 -e - ./pdfrun - ./rndwrite00 -e - ./fwrite00 - ./rmdir00 - ./rndrm00 - ./rndrm99 - ./gcd_hupper diff --git a/tests/fs-tests/stress/fs_stress00.sh.in b/tests/fs-tests/stress/fs_stress00.sh.in new file mode 100755 index 0000000..85ec7a2 --- /dev/null +++ b/tests/fs-tests/stress/fs_stress00.sh.in @@ -0,0 +1,58 @@ +#!/bin/sh + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +libexecpath=@libexecdir@/mtd-utils +TESTBINDIR=@testbindir@ + +TEST_DIR=$TEST_FILE_SYSTEM_MOUNT_DIR +if test -z "$TEST_DIR"; +then + TEST_DIR="/mnt/test_file_system" +fi + +FREESPACE=`$TESTBINDIR/free_space "$TEST_DIR"` + +if test -z "$FREESPACE"; +then + echo "Failed to determine free space" + exit 1 +fi + +if test -n "$1"; +then + DURATION="-d$1"; +else + DURATION=""; +fi + +FWRITE00=$TESTBINDIR/fwrite00 +RNDWR=$TESTBINDIR/rndwrite00 +GCHUP=$TESTBINDIR/gcd_hupper +PDFLUSH=$TESTBINDIR/pdfrun +FSIZE=$(( $FREESPACE/15 )); + +$TESTBINDIR/fstest_monitor $DURATION \ +"$FWRITE00 -z $FSIZE -n0 -p 20" \ +"$FWRITE00 -z $FSIZE -n0 -p 10 -s" \ +"$FWRITE00 -z $FSIZE -n0 -p 20 -u" \ +"$FWRITE00 -z $FSIZE -n0 -p 70 -o" \ +"$FWRITE00 -z $FSIZE -n0 -p 15 -s -o -u" \ +"$FWRITE00 -z $FSIZE -n0 -p 10 -u -c" \ +"$FWRITE00 -z $FSIZE -n0 -p 10 -u -o -c" \ +"$FWRITE00 -z $FSIZE -n0 -p 10 -o -c" \ +"$FWRITE00 -z $FSIZE -n0 -p 100 -o -u" \ +"$FWRITE00 -z $FSIZE -n0 -p 100 -s -o -u -c" \ +"$FWRITE00 -z $FSIZE -n0 -p 100 -o -u" \ +"$FWRITE00 -z $FSIZE -n0 -p 100 -u" \ +"$FWRITE00 -z $FSIZE -n0 -p 100 -s -o" \ +"$RNDWR -z $FSIZE -n0 -p 10 -e" \ +"$RNDWR -z $FSIZE -n0 -p 100 -e" \ +"$PDFLUSH -z 1073741824 -n0" + +STATUS=$? + +rm -rf ${TEST_DIR}/* + +exit $STATUS diff --git a/tests/fs-tests/stress/fs_stress01.sh.in b/tests/fs-tests/stress/fs_stress01.sh.in new file mode 100755 index 0000000..d0ea8f9 --- /dev/null +++ b/tests/fs-tests/stress/fs_stress01.sh.in @@ -0,0 +1,46 @@ +#!/bin/sh + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +libexecpath=@libexecdir@/mtd-utils +TESTBINDIR=@testbindir@ + +TEST_DIR=$TEST_FILE_SYSTEM_MOUNT_DIR +if test -z "$TEST_DIR"; +then + TEST_DIR="/mnt/test_file_system" +fi + +FREESPACE=`$TESTBINDIR/free_space "$TEST_DIR"` + +if test -z "$FREESPACE"; +then + echo "Failed to determine free space" + exit 1 +fi + +if test -n "$1"; +then + DURATION="-d$1"; +else + DURATION=""; +fi + +FWRITE00=$TESTBINDIR/fwrite00 +RNDWR=$TESTBINDIR/rndwrite00 +PDFLUSH=$TESTBINDIR/pdfrun +FSIZE=$(( $FREESPACE/15 )); + +$TESTBINDIR/fstest_monitor $DURATION \ +"$FWRITE00 -z $FSIZE -n0 -p 300" \ +"$FWRITE00 -z $FSIZE -n0 -u" \ +"$FWRITE00 -z $FSIZE -n0 -u -c" \ +"$FWRITE00 -z $FSIZE -n0 -s -o" \ +"$RNDWR -z $FSIZE -n0 -e" + +STATUS=$? + +rm -rf ${TEST_DIR}/* + +exit $STATUS diff --git a/tests/fs-tests/stress/stress00.sh b/tests/fs-tests/stress/stress00.sh deleted file mode 100755 index 60f8c0d..0000000 --- a/tests/fs-tests/stress/stress00.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -TEST_DIR=$TEST_FILE_SYSTEM_MOUNT_DIR -if test -z "$TEST_DIR"; -then - TEST_DIR="/mnt/test_file_system" -fi - -FREESPACE=`../utils/free_space "$TEST_DIR"` - -if test -z "$FREESPACE"; -then - echo "Failed to determine free space" - exit 1 -fi - -if test -n "$1"; -then - DURATION="-d$1"; -else - DURATION=""; -fi - -FWRITE00=atoms/fwrite00 -RNDWR=atoms/rndwrite00 -GCHUP=atoms/gcd_hupper -PDFLUSH=atoms/pdfrun -FSIZE=$(( $FREESPACE/15 )); - -../utils/fstest_monitor $DURATION \ -"$FWRITE00 -z $FSIZE -n0 -p 20" \ -"$FWRITE00 -z $FSIZE -n0 -p 10 -s" \ -"$FWRITE00 -z $FSIZE -n0 -p 20 -u" \ -"$FWRITE00 -z $FSIZE -n0 -p 70 -o" \ -"$FWRITE00 -z $FSIZE -n0 -p 15 -s -o -u" \ -"$FWRITE00 -z $FSIZE -n0 -p 10 -u -c" \ -"$FWRITE00 -z $FSIZE -n0 -p 10 -u -o -c" \ -"$FWRITE00 -z $FSIZE -n0 -p 10 -o -c" \ -"$FWRITE00 -z $FSIZE -n0 -p 100 -o -u" \ -"$FWRITE00 -z $FSIZE -n0 -p 100 -s -o -u -c" \ -"$FWRITE00 -z $FSIZE -n0 -p 100 -o -u" \ -"$FWRITE00 -z $FSIZE -n0 -p 100 -u" \ -"$FWRITE00 -z $FSIZE -n0 -p 100 -s -o" \ -"$RNDWR -z $FSIZE -n0 -p 10 -e" \ -"$RNDWR -z $FSIZE -n0 -p 100 -e" \ -"$PDFLUSH -z 1073741824 -n0" - -STATUS=$? - -rm -rf ${TEST_DIR}/* - -exit $STATUS diff --git a/tests/fs-tests/stress/stress01.sh b/tests/fs-tests/stress/stress01.sh deleted file mode 100755 index 5913c1c..0000000 --- a/tests/fs-tests/stress/stress01.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -TEST_DIR=$TEST_FILE_SYSTEM_MOUNT_DIR -if test -z "$TEST_DIR"; -then - TEST_DIR="/mnt/test_file_system" -fi - -FREESPACE=`../utils/free_space "$TEST_DIR"` - -if test -z "$FREESPACE"; -then - echo "Failed to determine free space" - exit 1 -fi - -if test -n "$1"; -then - DURATION="-d$1"; -else - DURATION=""; -fi - -FWRITE00=atoms/fwrite00 -RNDWR=atoms/rndwrite00 -PDFLUSH=atoms/pdfrun -FSIZE=$(( $FREESPACE/15 )); - -../utils/fstest_monitor $DURATION \ -"$FWRITE00 -z $FSIZE -n0 -p 300" \ -"$FWRITE00 -z $FSIZE -n0 -u" \ -"$FWRITE00 -z $FSIZE -n0 -u -c" \ -"$FWRITE00 -z $FSIZE -n0 -s -o" \ -"$RNDWR -z $FSIZE -n0 -e" - -STATUS=$? - -rm -rf ${TEST_DIR}/* - -exit $STATUS diff --git a/tests/fs-tests/utils/Makefile b/tests/fs-tests/utils/Makefile deleted file mode 100644 index 9fb60b5..0000000 --- a/tests/fs-tests/utils/Makefile +++ /dev/null @@ -1,19 +0,0 @@ - -ifeq ($(origin CC),default) -CC = gcc -endif - -CFLAGS := $(CFLAGS) -Wall -g -O2 -I../lib - -LDFLAGS := $(LDFLAGS) - -TARGETS = fstest_monitor free_space - -all: $(TARGETS) - -clean: - rm -f *.o $(TARGETS) - -tests: all - ./fstest_monitor - ./free_space > /dev/null -- cgit v1.2.3