[Qemu-devel] [PATCH v2 for-2.11 0/3] qemu-iotests: place output in unique dir

Jeff Cody posted 3 patches 6 years, 8 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
tests/qemu-iotests/001     |  6 ------
tests/qemu-iotests/002     |  6 ------
tests/qemu-iotests/003     |  6 ------
tests/qemu-iotests/004     |  6 ------
tests/qemu-iotests/005     |  6 ------
tests/qemu-iotests/007     |  7 -------
tests/qemu-iotests/008     |  6 ------
tests/qemu-iotests/009     |  6 ------
tests/qemu-iotests/010     |  6 ------
tests/qemu-iotests/011     |  6 ------
tests/qemu-iotests/012     |  6 ------
tests/qemu-iotests/013     |  6 ------
tests/qemu-iotests/014     |  6 ------
tests/qemu-iotests/015     |  7 -------
tests/qemu-iotests/017     |  6 ------
tests/qemu-iotests/018     |  6 ------
tests/qemu-iotests/019     |  8 --------
tests/qemu-iotests/020     |  8 --------
tests/qemu-iotests/021     |  6 ------
tests/qemu-iotests/022     |  6 ------
tests/qemu-iotests/023     |  6 ------
tests/qemu-iotests/024     |  8 --------
tests/qemu-iotests/025     |  6 ------
tests/qemu-iotests/026     |  7 -------
tests/qemu-iotests/027     |  6 ------
tests/qemu-iotests/028     |  8 --------
tests/qemu-iotests/029     |  7 -------
tests/qemu-iotests/031     |  6 ------
tests/qemu-iotests/032     |  6 ------
tests/qemu-iotests/033     |  6 ------
tests/qemu-iotests/034     |  6 ------
tests/qemu-iotests/035     |  6 ------
tests/qemu-iotests/036     |  6 ------
tests/qemu-iotests/037     |  6 ------
tests/qemu-iotests/038     |  6 ------
tests/qemu-iotests/039     |  6 ------
tests/qemu-iotests/042     |  6 ------
tests/qemu-iotests/043     |  7 -------
tests/qemu-iotests/046     |  6 ------
tests/qemu-iotests/047     |  6 ------
tests/qemu-iotests/048     |  8 --------
tests/qemu-iotests/048.out |  1 -
tests/qemu-iotests/049     |  6 ------
tests/qemu-iotests/050     |  8 --------
tests/qemu-iotests/051     |  6 ------
tests/qemu-iotests/052     |  6 ------
tests/qemu-iotests/053     |  7 -------
tests/qemu-iotests/054     |  6 ------
tests/qemu-iotests/058     |  8 +-------
tests/qemu-iotests/059     |  7 -------
tests/qemu-iotests/060     |  6 ------
tests/qemu-iotests/061     |  6 ------
tests/qemu-iotests/062     |  6 ------
tests/qemu-iotests/063     |  7 -------
tests/qemu-iotests/064     |  6 ------
tests/qemu-iotests/066     |  6 ------
tests/qemu-iotests/068     |  6 ------
tests/qemu-iotests/069     |  6 ------
tests/qemu-iotests/070     |  6 ------
tests/qemu-iotests/071     |  6 ------
tests/qemu-iotests/072     |  6 ------
tests/qemu-iotests/073     |  6 ------
tests/qemu-iotests/074     |  9 ---------
tests/qemu-iotests/074.out |  1 -
tests/qemu-iotests/075     |  6 ------
tests/qemu-iotests/076     |  6 ------
tests/qemu-iotests/077     |  6 ------
tests/qemu-iotests/078     |  6 ------
tests/qemu-iotests/079     |  6 ------
tests/qemu-iotests/080     |  7 -------
tests/qemu-iotests/081     |  8 --------
tests/qemu-iotests/082     |  6 ------
tests/qemu-iotests/084     |  6 ------
tests/qemu-iotests/085     | 13 +------------
tests/qemu-iotests/086     |  6 ------
tests/qemu-iotests/088     |  7 -------
tests/qemu-iotests/089     |  6 ------
tests/qemu-iotests/090     |  6 ------
tests/qemu-iotests/091     |  8 +-------
tests/qemu-iotests/092     |  7 -------
tests/qemu-iotests/094     |  9 +--------
tests/qemu-iotests/095     |  8 +-------
tests/qemu-iotests/097     |  7 -------
tests/qemu-iotests/098     |  7 -------
tests/qemu-iotests/099     |  6 ------
tests/qemu-iotests/101     |  6 ------
tests/qemu-iotests/102     |  7 +------
tests/qemu-iotests/103     |  6 ------
tests/qemu-iotests/104     |  2 --
tests/qemu-iotests/105     |  6 ------
tests/qemu-iotests/106     |  6 ------
tests/qemu-iotests/107     |  6 ------
tests/qemu-iotests/108     |  6 ------
tests/qemu-iotests/109     |  8 +-------
tests/qemu-iotests/110     |  6 ------
tests/qemu-iotests/111     |  6 ------
tests/qemu-iotests/112     |  6 ------
tests/qemu-iotests/113     |  6 ------
tests/qemu-iotests/114     |  6 ------
tests/qemu-iotests/115     |  6 ------
tests/qemu-iotests/116     |  6 ------
tests/qemu-iotests/117     |  7 +------
tests/qemu-iotests/119     |  6 ------
tests/qemu-iotests/120     |  6 ------
tests/qemu-iotests/121     |  6 ------
tests/qemu-iotests/122     |  7 -------
tests/qemu-iotests/123     |  7 -------
tests/qemu-iotests/125     |  6 ------
tests/qemu-iotests/130     |  7 +------
tests/qemu-iotests/131     |  6 ------
tests/qemu-iotests/133     |  6 ------
tests/qemu-iotests/134     |  6 ------
tests/qemu-iotests/135     |  6 ------
tests/qemu-iotests/137     |  6 ------
tests/qemu-iotests/138     |  6 ------
tests/qemu-iotests/140     |  8 +-------
tests/qemu-iotests/141     |  8 +-------
tests/qemu-iotests/142     |  7 -------
tests/qemu-iotests/143     |  7 +------
tests/qemu-iotests/144     |  8 +-------
tests/qemu-iotests/145     |  7 -------
tests/qemu-iotests/146     |  7 +------
tests/qemu-iotests/150     |  6 ------
tests/qemu-iotests/153     | 12 ------------
tests/qemu-iotests/154     |  6 ------
tests/qemu-iotests/156     |  7 +------
tests/qemu-iotests/157     |  6 ------
tests/qemu-iotests/158     |  6 ------
tests/qemu-iotests/159     |  7 -------
tests/qemu-iotests/160     |  7 -------
tests/qemu-iotests/162     |  7 -------
tests/qemu-iotests/170     |  7 -------
tests/qemu-iotests/171     |  6 ------
tests/qemu-iotests/172     |  8 --------
tests/qemu-iotests/173     |  8 +-------
tests/qemu-iotests/174     |  6 ------
tests/qemu-iotests/175     |  6 ------
tests/qemu-iotests/176     |  7 -------
tests/qemu-iotests/177     |  6 ------
tests/qemu-iotests/178     |  7 -------
tests/qemu-iotests/179     |  7 -------
tests/qemu-iotests/181     |  8 +-------
tests/qemu-iotests/182     |  6 ------
tests/qemu-iotests/183     |  9 +--------
tests/qemu-iotests/185     |  9 +--------
tests/qemu-iotests/186     |  6 ------
tests/qemu-iotests/188     |  6 ------
tests/qemu-iotests/189     |  6 ------
tests/qemu-iotests/190     |  7 -------
tests/qemu-iotests/check   | 24 ++++++++++++++++++++----
tests/qemu-iotests/common  |  6 ++++++
151 files changed, 45 insertions(+), 955 deletions(-)
[Qemu-devel] [PATCH v2 for-2.11 0/3] qemu-iotests: place output in unique dir
Posted by Jeff Cody 6 years, 8 months ago
Differences v1 -> v2:

Rebase on Kevin's block branch [Suggested-by Eric]

Patch 1:
'check': Added && to the directory change so that the test cannot run if the
         directory change fails  [Thanks Eric]

Patch 2: [Thanks Eric]
058: Removed the _cleanup(), and just trap _cleanup_nbd()
091: Preserve the _cleanup_qemu()
182: Remove spurious _cleanup_qemu() added in v1
190: New file

git-backport-diff -r kwolf/block.. -u 402fccc
Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch
[down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively

001/3:[0004] [FC] 'qemu-iotests: set TEST_DIR to a unique dir for each test'
002/3:[0022] [FC] 'qemu-iotests: remove file cleanup from bash tests'
003/3:[----] [--] 'qemu-iotests: add option to save temp files on error'
Do you want to view the diffs using meld? y/[n]:


This series does 2 things:

1.) Sets TEST_DIR to a unique subdirectory for each test
2.) Has './check' be responsible for removing temporary files
3.) Add option to './check' to retain temporary files in case of error

A caveat is #3 is working currently only for Bash tests, as the Python tests
still cleanup up after themselves.


Jeff Cody (3):
  qemu-iotests: set TEST_DIR to a unique dir for each test
  qemu-iotests: remove file cleanup from bash tests
  qemu-iotests: add option to save temp files on error

 tests/qemu-iotests/001     |  6 ------
 tests/qemu-iotests/002     |  6 ------
 tests/qemu-iotests/003     |  6 ------
 tests/qemu-iotests/004     |  6 ------
 tests/qemu-iotests/005     |  6 ------
 tests/qemu-iotests/007     |  7 -------
 tests/qemu-iotests/008     |  6 ------
 tests/qemu-iotests/009     |  6 ------
 tests/qemu-iotests/010     |  6 ------
 tests/qemu-iotests/011     |  6 ------
 tests/qemu-iotests/012     |  6 ------
 tests/qemu-iotests/013     |  6 ------
 tests/qemu-iotests/014     |  6 ------
 tests/qemu-iotests/015     |  7 -------
 tests/qemu-iotests/017     |  6 ------
 tests/qemu-iotests/018     |  6 ------
 tests/qemu-iotests/019     |  8 --------
 tests/qemu-iotests/020     |  8 --------
 tests/qemu-iotests/021     |  6 ------
 tests/qemu-iotests/022     |  6 ------
 tests/qemu-iotests/023     |  6 ------
 tests/qemu-iotests/024     |  8 --------
 tests/qemu-iotests/025     |  6 ------
 tests/qemu-iotests/026     |  7 -------
 tests/qemu-iotests/027     |  6 ------
 tests/qemu-iotests/028     |  8 --------
 tests/qemu-iotests/029     |  7 -------
 tests/qemu-iotests/031     |  6 ------
 tests/qemu-iotests/032     |  6 ------
 tests/qemu-iotests/033     |  6 ------
 tests/qemu-iotests/034     |  6 ------
 tests/qemu-iotests/035     |  6 ------
 tests/qemu-iotests/036     |  6 ------
 tests/qemu-iotests/037     |  6 ------
 tests/qemu-iotests/038     |  6 ------
 tests/qemu-iotests/039     |  6 ------
 tests/qemu-iotests/042     |  6 ------
 tests/qemu-iotests/043     |  7 -------
 tests/qemu-iotests/046     |  6 ------
 tests/qemu-iotests/047     |  6 ------
 tests/qemu-iotests/048     |  8 --------
 tests/qemu-iotests/048.out |  1 -
 tests/qemu-iotests/049     |  6 ------
 tests/qemu-iotests/050     |  8 --------
 tests/qemu-iotests/051     |  6 ------
 tests/qemu-iotests/052     |  6 ------
 tests/qemu-iotests/053     |  7 -------
 tests/qemu-iotests/054     |  6 ------
 tests/qemu-iotests/058     |  8 +-------
 tests/qemu-iotests/059     |  7 -------
 tests/qemu-iotests/060     |  6 ------
 tests/qemu-iotests/061     |  6 ------
 tests/qemu-iotests/062     |  6 ------
 tests/qemu-iotests/063     |  7 -------
 tests/qemu-iotests/064     |  6 ------
 tests/qemu-iotests/066     |  6 ------
 tests/qemu-iotests/068     |  6 ------
 tests/qemu-iotests/069     |  6 ------
 tests/qemu-iotests/070     |  6 ------
 tests/qemu-iotests/071     |  6 ------
 tests/qemu-iotests/072     |  6 ------
 tests/qemu-iotests/073     |  6 ------
 tests/qemu-iotests/074     |  9 ---------
 tests/qemu-iotests/074.out |  1 -
 tests/qemu-iotests/075     |  6 ------
 tests/qemu-iotests/076     |  6 ------
 tests/qemu-iotests/077     |  6 ------
 tests/qemu-iotests/078     |  6 ------
 tests/qemu-iotests/079     |  6 ------
 tests/qemu-iotests/080     |  7 -------
 tests/qemu-iotests/081     |  8 --------
 tests/qemu-iotests/082     |  6 ------
 tests/qemu-iotests/084     |  6 ------
 tests/qemu-iotests/085     | 13 +------------
 tests/qemu-iotests/086     |  6 ------
 tests/qemu-iotests/088     |  7 -------
 tests/qemu-iotests/089     |  6 ------
 tests/qemu-iotests/090     |  6 ------
 tests/qemu-iotests/091     |  8 +-------
 tests/qemu-iotests/092     |  7 -------
 tests/qemu-iotests/094     |  9 +--------
 tests/qemu-iotests/095     |  8 +-------
 tests/qemu-iotests/097     |  7 -------
 tests/qemu-iotests/098     |  7 -------
 tests/qemu-iotests/099     |  6 ------
 tests/qemu-iotests/101     |  6 ------
 tests/qemu-iotests/102     |  7 +------
 tests/qemu-iotests/103     |  6 ------
 tests/qemu-iotests/104     |  2 --
 tests/qemu-iotests/105     |  6 ------
 tests/qemu-iotests/106     |  6 ------
 tests/qemu-iotests/107     |  6 ------
 tests/qemu-iotests/108     |  6 ------
 tests/qemu-iotests/109     |  8 +-------
 tests/qemu-iotests/110     |  6 ------
 tests/qemu-iotests/111     |  6 ------
 tests/qemu-iotests/112     |  6 ------
 tests/qemu-iotests/113     |  6 ------
 tests/qemu-iotests/114     |  6 ------
 tests/qemu-iotests/115     |  6 ------
 tests/qemu-iotests/116     |  6 ------
 tests/qemu-iotests/117     |  7 +------
 tests/qemu-iotests/119     |  6 ------
 tests/qemu-iotests/120     |  6 ------
 tests/qemu-iotests/121     |  6 ------
 tests/qemu-iotests/122     |  7 -------
 tests/qemu-iotests/123     |  7 -------
 tests/qemu-iotests/125     |  6 ------
 tests/qemu-iotests/130     |  7 +------
 tests/qemu-iotests/131     |  6 ------
 tests/qemu-iotests/133     |  6 ------
 tests/qemu-iotests/134     |  6 ------
 tests/qemu-iotests/135     |  6 ------
 tests/qemu-iotests/137     |  6 ------
 tests/qemu-iotests/138     |  6 ------
 tests/qemu-iotests/140     |  8 +-------
 tests/qemu-iotests/141     |  8 +-------
 tests/qemu-iotests/142     |  7 -------
 tests/qemu-iotests/143     |  7 +------
 tests/qemu-iotests/144     |  8 +-------
 tests/qemu-iotests/145     |  7 -------
 tests/qemu-iotests/146     |  7 +------
 tests/qemu-iotests/150     |  6 ------
 tests/qemu-iotests/153     | 12 ------------
 tests/qemu-iotests/154     |  6 ------
 tests/qemu-iotests/156     |  7 +------
 tests/qemu-iotests/157     |  6 ------
 tests/qemu-iotests/158     |  6 ------
 tests/qemu-iotests/159     |  7 -------
 tests/qemu-iotests/160     |  7 -------
 tests/qemu-iotests/162     |  7 -------
 tests/qemu-iotests/170     |  7 -------
 tests/qemu-iotests/171     |  6 ------
 tests/qemu-iotests/172     |  8 --------
 tests/qemu-iotests/173     |  8 +-------
 tests/qemu-iotests/174     |  6 ------
 tests/qemu-iotests/175     |  6 ------
 tests/qemu-iotests/176     |  7 -------
 tests/qemu-iotests/177     |  6 ------
 tests/qemu-iotests/178     |  7 -------
 tests/qemu-iotests/179     |  7 -------
 tests/qemu-iotests/181     |  8 +-------
 tests/qemu-iotests/182     |  6 ------
 tests/qemu-iotests/183     |  9 +--------
 tests/qemu-iotests/185     |  9 +--------
 tests/qemu-iotests/186     |  6 ------
 tests/qemu-iotests/188     |  6 ------
 tests/qemu-iotests/189     |  6 ------
 tests/qemu-iotests/190     |  7 -------
 tests/qemu-iotests/check   | 24 ++++++++++++++++++++----
 tests/qemu-iotests/common  |  6 ++++++
 151 files changed, 45 insertions(+), 955 deletions(-)

-- 
2.9.4