Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Mar 27, 2020

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit 3bd2078bdd1c173f9d02bc20e2d630302555a8a0:

zbd: add test for stressing zone locking (2020-03-17 20:05:54 -0600)

are available in the Git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to 983319d02626347d178b34320ac5835ae7ecad02:

Merge branch 'jsonplus2csv' of https://github.com/vincentkfu/fio (2020-03-26 09:03:40 -0600)

----------------------------------------------------------------
Jens Axboe (1):
Merge branch 'jsonplus2csv' of https://github.com/vincentkfu/fio

Vincent Fu (3):
tools/fio_jsonplus2csv: accommodate multiple lat measurements t/jsonplus2csv_test.py: test script for tools/fio_jsonplus_clat2csv .travis.yml: remove pip line from xcode11.2 config

 .appveyor.yml               |   2 +-
 .travis.yml                 |   3 +-
 t/jsonplus2csv_test.py      | 150 ++++++++++++++++++
 t/run-fio-tests.py          |   8 +
 tools/fio_jsonplus_clat2csv | 379 +++++++++++++++++++++++++++++++-------------
 5 files changed, 428 insertions(+), 114 deletions(-)
 create mode 100755 t/jsonplus2csv_test.py

---

Diff of recent changes:

.appveyor.yml +1 -1
index bf0978ad..2f962c4b 100644
@@ -15,7 +15,7 @@ environment:
 install:
   - '%CYG_ROOT%\setup-x86_64.exe --quiet-mode --no-shortcuts --only-site --site "%CYG_MIRROR%" --packages "mingw64-%PACKAGE_ARCH%-zlib,mingw64-%PACKAGE_ARCH%-CUnit" > NUL'
   - SET PATH=C:\Python38-x64;%CYG_ROOT%\bin;%PATH% # NB: Changed env variables persist to later sections
-  - python.exe -m pip install scipy
+  - python.exe -m pip install scipy six
 
 build_script:
   - 'bash.exe -lc "cd \"${APPVEYOR_BUILD_FOLDER}\" && ./configure --disable-native --extra-cflags=\"-Werror\" ${CONFIGURE_OPTIONS} && make.exe'
.travis.yml +2 -1
index 77c31b77..6b710cc3 100644
@@ -48,8 +48,9 @@ before_install:
         brew install cunit;
         if [[ "$TRAVIS_OSX_IMAGE" == "xcode11.2" ]]; then
             pip3 install scipy;
+        else
+            pip install scipy;
         fi;
-        pip install scipy;
     fi;
 script:
   - ./configure --extra-cflags="${EXTRA_CFLAGS}" && make
t/jsonplus2csv_test.py new file +150 -0

150 lines not on this page · raw message

t/run-fio-tests.py +8 -0
index 36fcb2f4..ea5abc4e 100755
@@ -757,6 +757,14 @@ TEST_LIST = [
         'success':          SUCCESS_DEFAULT,
         'requirements':     [],
     },
+    {
+        'test_id':          1011,
+        'test_class':       FioExeTest,
+        'exe':              't/jsonplus2csv_test.py',
+        'parameters':       ['-f', '{fio_path}'],
+        'success':          SUCCESS_DEFAULT,
+        'requirements':     [],
+    },
 ]
 
 
tools/fio_jsonplus_clat2csv +267 -112

440 lines not on this page · raw message