Commit 06b59ec5 authored by Peter Palfrader's avatar Peter Palfrader
Browse files

0.2.2.4-alpha failed to ship test.h so we had included it in the debian 

diff.  The upstream bug has long since been fixed so we should probably
stop shipping our own copy of test.h
parent 7fd427c7

debian/changelog

+4 −1
Original line number Diff line number Diff line
@@ -35,8 +35,11 @@ tor (0.2.2.9-alpha-1) experimental; urgency=low 
    usr/share/doc/tor; closes: #568934).

  * Add stark README.polipo with the instructions from Juliusz Chroboczek.

    (closes: #413730)

  * 0.2.2.4-alpha failed to ship test.h so we had included it in the

    debian diff.  The upstream bug has long since been fixed so we should

    probably stop shipping our own copy of test.h



 -- Peter Palfrader <weasel@debian.org>  Sat, 27 Feb 2010 16:27:52 +0100

 -- Peter Palfrader <weasel@debian.org>  Sat, 27 Feb 2010 16:33:22 +0100



tor (0.2.2.8-alpha-1) experimental; urgency=low

debian/rules

+0 −9
Original line number Diff line number Diff line
@@ -73,11 +73,6 @@ MANPAGE_INS=doc/tor.1.in doc/torify.1.in doc/tor-gencert.1.in doc/tor-resolve.1. 


configure: patch-stamp

config.status: configure

	# clean up test.h stuff.  XXX - expected to no longer be needed after tor-0.2.2.4-alpha

	rm -f src/test/test.h.orig

	! [ -e src/test/test.h ] || mv src/test/test.h src/test/test.h.orig

	cp debian/src-test-test.h src/test/test.h



	dh_testdir

	./configure \

		$(confflags) \
@@ -127,10 +122,6 @@ clean: unpatch 


	[ ! -f Makefile ] || $(MAKE) distclean



	# clean up test.h stuff.  XXX - expected to no longer be needed after tor-0.2.2.4-alpha

	rm -f src/test/test.h

	! [ -e src/test/test.h.orig ] || mv src/test/test.h.orig src/test/test.h



	# Normally the .deb wouldn't ship with a ../.git

	if [ -d .git ] && which git >/dev/null; then \

		echo "\"`git rev-parse --short=16 HEAD`\"" > "debian/micro-revision.i" ; \

debian/src-test-test.h

deleted100644 → 0
+0 −75
Original line number Diff line number Diff line 
/* Copyright (c) 2001-2003, Roger Dingledine.

 * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.

 * Copyright (c) 2007-2009, The Tor Project, Inc. */

/* See LICENSE for licensing information */



#ifndef _TOR_TEST_H

#define _TOR_TEST_H



/**

 * \file test.h

 * \brief Macros and functions used by unit tests.

 */



#include "compat.h"

#include "tinytest.h"

#define TT_EXIT_TEST_FUNCTION STMT_BEGIN goto done; STMT_END

#include "tinytest_macros.h"



#ifdef __GNUC__

#define PRETTY_FUNCTION __PRETTY_FUNCTION__

#else

#define PRETTY_FUNCTION ""

#endif



#define test_fail_msg(msg) TT_DIE((msg))



#define test_fail() test_fail_msg("Assertion failed.")



#define test_assert(expr) tt_assert(expr)



#define test_eq(expr1, expr2) tt_int_op((expr1), ==, (expr2))

#define test_eq_ptr(expr1, expr2) tt_ptr_op((expr1), ==, (expr2))

#define test_neq(expr1, expr2) tt_int_op((expr1), !=, (expr2))

#define test_neq_ptr(expr1, expr2) tt_ptr_op((expr1), !=, (expr2))

#define test_streq(expr1, expr2) tt_str_op((expr1), ==, (expr2))

#define test_strneq(expr1, expr2) tt_str_op((expr1), !=, (expr2))

#define test_streq(expr1, expr2) tt_str_op((expr1), ==, (expr2))



#define test_mem_op(expr1, op, expr2, len)                              \

  tt_assert_test_fmt_type(expr1,expr2,#expr1" "#op" "#expr2,            \

                          const char *,                                 \

                          (memcmp(_val1, _val2, len) op 0),             \

                          char *, "%s",                                 \

                          { size_t printlen = (len)*2+1;                \

                            _print = tor_malloc(printlen);              \

                            base16_encode(_print, printlen, _value,     \

                                          (len)); },                    \

                          { tor_free(_print); }                         \

                          );



#define test_memeq(expr1, expr2, len) test_mem_op((expr1), ==, (expr2), len)

#define test_memneq(expr1, expr2, len) test_mem_op((expr1), !=, (expr2), len)



/* As test_mem_op, but decodes 'hex' before comparing.  There must be a

 * local char* variable called mem_op_hex_tmp for this to work. */

#define test_mem_op_hex(expr1, op, hex)                                 \

  STMT_BEGIN                                                            \

  size_t length = strlen(hex);                                          \

  tor_free(mem_op_hex_tmp);                                             \

  mem_op_hex_tmp = tor_malloc(length/2);                                \

  tor_assert((length&1)==0);                                            \

  base16_decode(mem_op_hex_tmp, length/2, hex, length);                 \

  test_mem_op(expr1, op, mem_op_hex_tmp, length/2);                     \

  STMT_END



#define test_memeq_hex(expr1, hex) test_mem_op_hex(expr1, ==, hex)



const char *get_fname(const char *name);

crypto_pk_env_t *pk_generate(int idx);



void legacy_test_helper(void *data);

extern const struct testcase_setup_t legacy_setup;



#endif