#5 Test suite changes to help with CI configuration
Merged 2 years ago by andyp. Opened 2 years ago by andyp.

file modified
+9
@@ -6,3 +6,12 @@ 

  {

  	printf $((GFS_TGT_SZ*1073741824/$1))

  }

+ 

+ gfs_tgt_cleanup()

+ {

+ 	if $1; then

+ 		rm -f $GFS_TGT

+ 	fi

+ }

+ 

+ trap 'gfs_tgt_cleanup $at_arg_always_clean_testvol' EXIT

file modified
+6
@@ -27,12 +27,14 @@ 

  

  AT_SETUP([Quota change file size validation])

  AT_KEYWORDS(mkfs.gfs2 mkfs)

+ GFS_TGT_REGEN

  AT_CHECK([$GFS_MKFS -p lock_nolock -c 0 $GFS_TGT], 255, [ignore], [ignore])

  AT_CHECK([$GFS_MKFS -p lock_nolock -c 65 $GFS_TGT], 255, [ignore], [ignore])

  AT_CLEANUP

  

  AT_SETUP([Format version validation])

  AT_KEYWORDS(mkfs.gfs2 mkfs)

+ GFS_TGT_REGEN

  AT_CHECK([$GFS_MKFS -p lock_nolock -o format=-1 $GFS_TGT], 255, [ignore], [ignore])

  AT_CHECK([$GFS_MKFS -p lock_nolock -o format=0 $GFS_TGT], 255, [ignore], [ignore])

  AT_CHECK([$GFS_MKFS -p lock_nolock -o format=1800 $GFS_TGT], 255, [ignore], [ignore])
@@ -123,6 +125,7 @@ 

  

  AT_SETUP([Device i/o limits handling])

  AT_KEYWORDS(mkfs.gfs2 mkfs)

+ GFS_TGT_REGEN

  AT_CHECK([$GFS_MKFS -p lock_nolock -o test_topology=0:0:0:0:0 $GFS_TGT], 0, [ignore], [ignore])

  AT_CHECK([$GFS_MKFS -p lock_nolock -o test_topology=0:512:512:512:512 $GFS_TGT], 0, [ignore], [ignore])

  AT_CHECK([gfs2_edit -p sb field sb_bsize $GFS_TGT | tr -d '\n' ], 0, [4096], [ignore])
@@ -134,6 +137,7 @@ 

  

  AT_SETUP([Resource group alignment])

  AT_KEYWORDS(mkfs.gfs2 mkfs)

+ GFS_TGT_REGEN

  AT_CHECK([$GFS_MKFS -p lock_nolock -o test_topology=0:512:65536:393216:512 $GFS_TGT], 0, [ignore], [ignore])

  # Check rgrp alignment to minimum_io_size: 65536 / 4096 == 16

  AT_CHECK([gfs2_edit -p rindex $GFS_TGT | grep ri_addr | awk '{print $2, $2 % 16; if ($2 % 16 != 0) { exit 1 }}'], 0, [ignore], [ignore])
@@ -143,6 +147,7 @@ 

  

  AT_SETUP([Values of rg_skip])

  AT_KEYWORDS(mkfs.gfs2 mkfs)

+ GFS_TGT_REGEN

  AT_CHECK([$GFS_MKFS -p lock_nolock -r 2048 $GFS_TGT], 0, [ignore], [ignore])

  AT_CHECK(GFS_RUN_OR_SKIP([rgskipcheck.sh $GFS_TGT]), 0, [ignore], [ignore])

  AT_CHECK([$GFS_MKFS -p lock_nolock -r 1024 $GFS_TGT], 0, [ignore], [ignore])
@@ -159,6 +164,7 @@ 

  

  AT_SETUP([Values of rg_data0, rg_data, rg_bitbytes])

  AT_KEYWORDS(mkfs.gfs2 mkfs)

+ GFS_TGT_REGEN

  AT_CHECK([$GFS_MKFS -p lock_nolock -r 2048 $GFS_TGT], 0, [ignore], [ignore])

  AT_CHECK(GFS_RUN_OR_SKIP([rgrifieldscheck.sh $GFS_TGT]), 0, [ignore], [ignore])

  AT_CHECK([$GFS_MKFS -p lock_nolock -r 1024 $GFS_TGT], 0, [ignore], [ignore])

file modified
+4 -1
@@ -7,7 +7,7 @@ 

  AT_SKIP_IF([test ! -f ${GFS_TGT}])])

  

  # Regenerate the sparse file used for testing, with a given size, and skip the test if it fails

- # Usage: GFS_TGT_REGEN(<size>)

+ # Usage: GFS_TGT_SIZE(<size>)

  m4_define([GFS_TGT_SIZE],

  [AT_CHECK([rm -f $GFS_TGT && truncate -s $1 ${GFS_TGT}], [ignore], [ignore], [ignore])

  AT_SKIP_IF([test ! -f ${GFS_TGT}])])
@@ -47,6 +47,9 @@ 

  # Test suite begins here

  AT_INIT([])

  AT_COLOR_TESTS

+ AT_ARG_OPTION([always-clean-testvol],

+               [AS_HELP_STRING([--always-clean-testvol],

+                               [Remove the test file whether tests succeed or not])])

  

  m4_include([mkfs.at])

  m4_include([fsck.at])

file modified
+2
@@ -3,6 +3,7 @@ 

  

  AT_SETUP([Format version])

  AT_KEYWORDS(tunegfs2 tune)

+ GFS_TGT_REGEN

  AT_CHECK([$GFS_MKFS -p lock_nolock -o format=1802 $GFS_TGT], 0, [ignore], [ignore])

  # Exit code 65 == EX_DATAERR (sysexits.h)

  AT_CHECK([tunegfs2 -r 0 $GFS_TGT], 65, [ignore], [ignore])
@@ -26,6 +27,7 @@ 

  

  AT_SETUP([Expected output])

  AT_KEYWORDS(tunegfs2 tune)

+ GFS_TGT_REGEN

  AT_CHECK([echo -n "File system volume name: cluster:fsname

  File system UUID: e90815fc-087b-460c-b8a5-8edc8a2ed691

  File system magic number: 0x1161970

no initial comment

Pull-Request has been merged by andyp

2 years ago