projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add tests from t/ to the Windows installer
[fio.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 284621d3a708e7d56e220c3bd0cd3c0644fa22bc..fe02bf1df86f0d55334959a5200e91680ad339a3 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-59,6
+59,18
@@
ifdef CONFIG_LIBHDFS
SOURCE += engines/libhdfs.c
endif
SOURCE += engines/libhdfs.c
endif
+ifdef CONFIG_LIBISCSI
+ CFLAGS += $(LIBISCSI_CFLAGS)
+ LIBS += $(LIBISCSI_LIBS)
+ SOURCE += engines/libiscsi.c
+endif
+
+ifdef CONFIG_LIBNBD
+ CFLAGS += $(LIBNBD_CFLAGS)
+ LIBS += $(LIBNBD_LIBS)
+ SOURCE += engines/nbd.c
+endif
+
ifdef CONFIG_64BIT
CFLAGS += -DBITS_PER_LONG=64
endif
ifdef CONFIG_64BIT
CFLAGS += -DBITS_PER_LONG=64
endif
@@
-151,7
+163,7
@@
endif
ifeq ($(CONFIG_TARGET_OS), Linux)
SOURCE += diskutil.c fifo.c blktrace.c cgroup.c trim.c engines/sg.c \
ifeq ($(CONFIG_TARGET_OS), Linux)
SOURCE += diskutil.c fifo.c blktrace.c cgroup.c trim.c engines/sg.c \
- oslib/linux-dev-lookup.c
+ oslib/linux-dev-lookup.c
engines/io_uring.c
LIBS += -lpthread -ldl
LDFLAGS += -rdynamic
endif
LIBS += -lpthread -ldl
LDFLAGS += -rdynamic
endif
@@
-263,8
+275,8
@@
T_VS_PROGS = t/fio-verify-state
T_PIPE_ASYNC_OBJS = t/read-to-pipe-async.o
T_PIPE_ASYNC_PROGS = t/read-to-pipe-async
T_PIPE_ASYNC_OBJS = t/read-to-pipe-async.o
T_PIPE_ASYNC_PROGS = t/read-to-pipe-async
-T_
AIO_RING_OBJS = t/aio-
ring.o
-T_
AIO_RING_PROGS = t/aio-
ring
+T_
IOU_RING_OBJS = t/io_u
ring.o
+T_
IOU_RING_PROGS = t/io_u
ring
T_MEMLOCK_OBJS = t/memlock.o
T_MEMLOCK_PROGS = t/memlock
T_MEMLOCK_OBJS = t/memlock.o
T_MEMLOCK_PROGS = t/memlock
@@
-284,7
+296,7
@@
T_OBJS += $(T_VS_OBJS)
T_OBJS += $(T_PIPE_ASYNC_OBJS)
T_OBJS += $(T_MEMLOCK_OBJS)
T_OBJS += $(T_TT_OBJS)
T_OBJS += $(T_PIPE_ASYNC_OBJS)
T_OBJS += $(T_MEMLOCK_OBJS)
T_OBJS += $(T_TT_OBJS)
-T_OBJS += $(T_
AIO
_RING_OBJS)
+T_OBJS += $(T_
IOU
_RING_OBJS)
ifneq (,$(findstring CYGWIN,$(CONFIG_TARGET_OS)))
T_DEDUPE_OBJS += os/windows/posix.o lib/hweight.o
ifneq (,$(findstring CYGWIN,$(CONFIG_TARGET_OS)))
T_DEDUPE_OBJS += os/windows/posix.o lib/hweight.o
@@
-444,8
+456,9
@@
cairo_text_helpers.o: cairo_text_helpers.c cairo_text_helpers.h
printing.o: printing.c printing.h
$(QUIET_CC)$(CC) $(CFLAGS) $(GTK_CFLAGS) $(CPPFLAGS) -c $<
printing.o: printing.c printing.h
$(QUIET_CC)$(CC) $(CFLAGS) $(GTK_CFLAGS) $(CPPFLAGS) -c $<
-t/aio-ring: $(T_AIO_RING_OBJS)
- $(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_AIO_RING_OBJS) $(LIBS)
+t/io_uring.o: os/linux/io_uring.h
+t/io_uring: $(T_IOU_RING_OBJS)
+ $(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_IOU_RING_OBJS) $(LIBS)
t/read-to-pipe-async: $(T_PIPE_ASYNC_OBJS)
$(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_PIPE_ASYNC_OBJS) $(LIBS)
t/read-to-pipe-async: $(T_PIPE_ASYNC_OBJS)
$(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_PIPE_ASYNC_OBJS) $(LIBS)