diff options
Diffstat (limited to 'libsframe/testsuite/libsframe.decode/frecnt-2.c')
| -rw-r--r-- | libsframe/testsuite/libsframe.decode/frecnt-2.c | 37 |
1 files changed, 9 insertions, 28 deletions
diff --git a/libsframe/testsuite/libsframe.decode/frecnt-2.c b/libsframe/testsuite/libsframe.decode/frecnt-2.c index 912fdbd..a8ca69f 100644 --- a/libsframe/testsuite/libsframe.decode/frecnt-2.c +++ b/libsframe/testsuite/libsframe.decode/frecnt-2.c @@ -15,17 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - -#include <stdio.h> -#include <stdlib.h> -#include <sys/stat.h> - -#include "sframe-api.h" - -/* DejaGnu should not use gnulib's vsnprintf replacement here. */ -#undef vsnprintf -#include <dejagnu.h> +#include "sframe-test.h" /* * SFrame info from the following source (2 fde 8 fres): @@ -48,16 +38,7 @@ main (void) struct stat st; char *sf_buf; size_t sf_size; - -#define TEST(name, cond) \ - do \ - { \ - if (cond) \ - pass (name); \ - else \ - fail (name); \ - } \ - while (0) + uint8_t rep_block_size; fp = fopen (DATA, "r"); if (fp == NULL) @@ -78,20 +59,20 @@ main (void) /* Execute tests. */ sf_size = fread (sf_buf, 1, st.st_size, fp); fclose (fp); - TEST ("frecnt-2: Read data", sf_size != 0); + TEST (sf_size != 0, "frecnt-2: Read data"); dctx = sframe_decode (sf_buf, sf_size, &err); - TEST ("frecnt-2: Decode setup", dctx != NULL); + TEST (dctx != NULL, "frecnt-2: Decode setup"); unsigned int fde_cnt = sframe_decoder_get_num_fidx (dctx); - TEST ("frecnt-2: Decode FDE count", fde_cnt == 2); + TEST (fde_cnt == 2, "frecnt-2: Decode FDE count"); for (i = 0; i < fde_cnt; ++i) { - err = sframe_decoder_get_funcdesc (dctx, i, &nfres, &fsize, &fstart, - &finfo); - TEST ("frecnt-2: Decode get FDE", err == 0); - TEST ("frecnt-2: Decode get FRE", nfres == 4); + err = sframe_decoder_get_funcdesc_v2 (dctx, i, &nfres, &fsize, &fstart, + &finfo, &rep_block_size); + TEST (err == 0, "frecnt-2: Decode get FDE%d", i); + TEST (nfres == 4, "frecnt-2: Decode num FREs for FDE%d", i); } free (sf_buf); |