Recent changes (master)
The following changes since commit e82ec77644f4fb7eccb3441485762c1c1c574b2f:
t/latency_percentiles.py: correct terse parse (2020-11-09 12:13:25 -0700)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 84f9318fc16e33633ac9f789dcef7cc58c3b8595:
t/latency_percentiles.py: tweak terse output parse (2020-11-12 11:26:58 -0700)
----------------------------------------------------------------
Jens Axboe (3):
Makefile: fix fio version gen
Fio 3.24
t/latency_percentiles.py: tweak terse output parse
FIO-VERSION-GEN | 2 +- Makefile | 8 ++++---- t/latency_percentiles.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-)
---
Diff of recent changes:
FIO-VERSION-GEN +1 -1
@@ -1,7 +1,7 @@ #!/bin/sh GVF=FIO-VERSION-FILE -DEF_VER=fio-3.23 +DEF_VER=fio-3.24 LF=' '
Makefile +4 -4
@@ -263,6 +263,10 @@ CFLAGS += $$($(1)_CFLAGS) endef endif +FIO-VERSION-FILE: FORCE + @$(SHELL) $(SRCDIR)/FIO-VERSION-GEN +-include FIO-VERSION-FILE + override CFLAGS := -DFIO_VERSION='"$(FIO_VERSION)"' $(FIO_CFLAGS) $(CFLAGS) $(foreach eng,$(ENGINES),$(eval $(call engine_template,$(eng))))
@@ -433,10 +437,6 @@ all: $(PROGS) $(T_TEST_PROGS) $(UT_PROGS) $(SCRIPTS) $(ENGS_OBJS) FORCE .PHONY: all install clean test .PHONY: FORCE cscope -FIO-VERSION-FILE: FORCE - @$(SHELL) $(SRCDIR)/FIO-VERSION-GEN --include FIO-VERSION-FILE - %.o : %.c @mkdir -p $(dir $@) $(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $<
t/latency_percentiles.py +2 -2
@@ -216,7 +216,7 @@ class FioLatTest(): file_data = file.read() # - # Read the first few lines and see if any of them begin with '3;fio-' + # Read the first few lines and see if any of them begin with '3;' # If so, the line is probably terse output. Obviously, this only # works for fio terse version 3 and it does not work for # multi-line terse output
@@ -224,7 +224,7 @@ class FioLatTest(): lines = file_data.splitlines() for i in range(8): file_data = lines[i] - if file_data.startswith('3;;latency'): + if file_data.startswith('3;'): self.terse_data = file_data.split(';') return True