[ntar-workers] [Patch] tests automation

Sebastien Tandel sebastien at tandel.be
Tue Jan 16 18:12:58 GMT 2007


Hi,

ouch ... the patch was supposed to be with the mail ;)



Regards,

Sebastien Tandel

Gianluca Varenni wrote:
>
> ----- Original Message ----- From: "Sebastien Tandel"
> <sebastien at tandel.be>
> To: <ntar-workers at winpcap.org>
> Sent: Monday, January 15, 2007 4:15 PM
> Subject: [ntar-workers] [Patch] tests automation
>
>
>> Hi all,
>>
>> I tried ntar on a debian platform.
>>
>> There was only a simple error in error.c
>> error.c : line 18. No eol : easy to solve by editing the file with vim
>> but ... :)
>> After this little step, the compilation on Debian was fine.
>
> I have fixed the problem. I don't know why the error didnt show up on
> my linux distros...
>
>>
>> I made Makefiles for a basic tests automation system.
>>
>> *** make check ***
>> will compile the testxxx if needed, execute the tests and check against
>> testxxx.expected to see if it is correct. (until 16)
>> testxxx.expected have been generated "by hand" the first time (not
>> really but at least checked for the results).
>>
>> will output something like
>> test001 [ PASS ]
>> test002 [ FAIL ]
>> test003 [ PASS ]
>> test004 [ PASS ]
>> test005 [ FAIL ]
>> ...
>>
>>
>> Note :
>> 1) You first have to move testxxx_in.tar in their respective directories
>> tests/testxxx, if needed.
>
> No big deal. Actually we can have a script moving the binaries to the
> folder containing the testXXX_in.ntar  files.
>
>> 2)  I really don't know if it will work on Windows as it uses diff.
>
> Uhm... It can be a prerequisite, i'm not too much concerned about
> that. As a matter of facts, for almost all the projects i work on
> under Windows Cygwin is a prerequisite as I use a bunch of
> patching/diffing/scripting/...
>
>
>> 3) As test0017 and test018 are waiting for user input, I did not
>> integrate them in the tests automation.
>
> It's fine. More than regression tests they are apps I used to measure
> the performance of the library on different platforms and hard drives.
>
> What I'm more concerned about the about the automation system is that
> i think it will work on little endian systems only. The regression
> outputs I have created are little endian, on a big endian machine the
> file output is different. The library is able to deal with reading
> files in both endianness, but the generated files use the byte order
> of the host. The best approach would be to create different regression
> outputs for little- and big-endian machines, using the proper ones for
> the test automation.
>
> In any case, good job! If you send me a unified diff with the
> makefile, I can apply it and commit it to the CVS.
>
> I don't know if you have seen the discussion with Benn Bollay on the
> wireshark-dev mailing list, in any case I'm working in these weeks to
> add some new stuff to NTAR (some is already there, but experimental
> and not public). Namely better support for plugins (the APIs are
> there, the implementation is still not efficient, i need to fix the
> documentation and the mess i created with the include files), and
> support for seeks and backward reading in the file.
>
> You can find the wireshark-dev thread here
>
> http://www.wireshark.org/lists/wireshark-dev/200701/msg00173.html
>
>
>>
>>
>> P.S. : The files permissions are generally set to 0710 which is not a
>> good idea (don't know if it's a Windows feature but it's really ugly all
>> these green text files on my screen :)).
>>
>
> Uhm... it can be an issue with how i repackaged the files in the
> tarball for *nix (it's totally possible i decompressed the zip on my
> Windows machine, and repackaged everything here). I'll do a CVS
> checkout on a linux distro and see if they are screwed up on the CVS
> as well.
>
> Have a nice day
> GV
>
>>
>>
>> Regards,
>>
>> Sebastien Tandel
>> _______________________________________________
>> ntar-workers mailing list
>> ntar-workers at winpcap.org
>> https://www.winpcap.org/mailman/listinfo/ntar-workers 
>
> _______________________________________________
> ntar-workers mailing list
> ntar-workers at winpcap.org
> https://www.winpcap.org/mailman/listinfo/ntar-workers
>
>

-------------- next part --------------
diff -urN --strip-trailing-cr -X exc-ntar ntar/Makefile.in ntar-dev/Makefile.in
--- ntar/Makefile.in	2005-07-10 01:39:49.000000000 +0200
+++ ntar-dev/Makefile.in	2007-01-15 23:55:05.000000000 +0100
@@ -119,7 +119,7 @@
 	rm -f $(DESTDIR)$(includedir)/ntar.h
 
 clean:
-	rm -f $(CLEANFILES)
+	rm -f $(CLEANFILES) && cd tests && $(MAKE) clean
 
 distclean:
 	rm -f $(CLEANFILES) Makefile config.cache config.log config.status \
@@ -127,3 +127,9 @@
 
 depend:	ntar.c
 	./mkdep -c $(CC) $(DEFS) $(INCLS) $(SRC)
+
+tests:
+	cd tests && $(MAKE) tests
+
+check:
+	cd tests && $(MAKE) check
diff -urN --strip-trailing-cr -X exc-ntar ntar/error.c ntar-dev/error.c
--- ntar/error.c	2005-07-10 01:39:07.000000000 +0200
+++ ntar-dev/error.c	2007-01-15 19:05:34.000000000 +0100
@@ -15,4 +15,5 @@
 	case ENOSPC:	return NTAR_FAILURE_DISKFULL;
 	default:		return NTAR_FAILURE_UNKNOWNERRNO;
 	}
-}
\ No newline at end of file
+}
+
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/Makefile ntar-dev/tests/Makefile
--- ntar/tests/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ ntar-dev/tests/Makefile	2007-01-16 01:11:13.000000000 +0100
@@ -0,0 +1,26 @@
+MAKE = make
+SUBDIRS = test001 test002 test003 test004 test005 test006 test007 test008 test009 test010 test011 test012 test013 test014 test015 test016 
+
+
+all:
+	@list='$(SUBDIRS)'; for subdir in $$list; do \
+		test "$$subdir" == "." || (cd $$subdir && $(MAKE)) || exit 1;\
+	done
+
+tests: all
+
+check: 
+	@list='$(SUBDIRS)'; for subdir in $$list; do \
+	test "$$subdir" == "." || (cd $$subdir && $(MAKE) check 1>/dev/null 2>&1); \
+	if test $$? -eq 0; \
+	then \
+	  echo -e "$$subdir [\\033[1;32m PASS \\033[0;39m]"; \
+	else \
+	  echo -e "$$subdir [\\033[1;31m FAIL \\033[0;39m]"; \
+	fi; \
+	done
+
+clean:
+	@list='$(SUBDIRS)'; for subdir in $$list; do \
+	test "$$subdir" == "." || (cd $$subdir && $(MAKE) clean) || exit 1; \
+	done
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test001/Makefile ntar-dev/tests/test001/Makefile
--- ntar/tests/test001/Makefile	2005-06-17 23:32:55.000000000 +0200
+++ ntar-dev/tests/test001/Makefile	2007-01-16 00:18:51.000000000 +0100
@@ -1,9 +1,17 @@
-CFLAGS = -I ../..
-LIBS = -lntar
+ROOT_DIR=../..
+CFLAGS = -I $(ROOT_DIR)
+LIBS = -lntar -L$(ROOT_DIR)
 TESTNAME = test001
 
+all: $(TESTNAME)
+
 $(TESTNAME): $(TESTNAME).c
 	$(CC) $(CFLAGS) $(TESTNAME).c $(LIBS) -o $@
 
+check: $(TESTNAME)
+	test -f $(TESTNAME).ntar && rm $(TESTNAME).ntar; \
+	LD_LIBRARY_PATH=$(ROOT_DIR) ./$(TESTNAME) 2>$(TESTNAME).txt; \
+	diff $(TESTNAME).txt $(TESTNAME).expected || exit 1; 
+
 clean:
-	rm -f $(TESTNAME) *.o core
\ No newline at end of file
+	rm -f $(TESTNAME) *.o core .ntar
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test001/test001.expected ntar-dev/tests/test001/test001.expected
--- ntar/tests/test001/test001.expected	1970-01-01 01:00:00.000000000 +0100
+++ ntar-dev/tests/test001/test001.expected	2007-01-15 20:31:41.000000000 +0100
@@ -0,0 +1,4 @@
+File created
+Section opened
+Section closed
+File closed
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test002/Makefile ntar-dev/tests/test002/Makefile
--- ntar/tests/test002/Makefile	2005-06-17 23:32:41.000000000 +0200
+++ ntar-dev/tests/test002/Makefile	2007-01-16 00:01:18.000000000 +0100
@@ -1,9 +1,18 @@
-CFLAGS = -I ../..
-LIBS = -lntar
+ROOT_DIR=../..
+CFLAGS = -I $(ROOT_DIR)
+LIBS = -lntar -L$(ROOT_DIR)
 TESTNAME = test002
 
+all: $(TESTNAME)
+
 $(TESTNAME): $(TESTNAME).c
 	$(CC) $(CFLAGS) $(TESTNAME).c $(LIBS) -o $@
 
+check: $(TESTNAME)
+	test -f $(TESTNAME).ntar && rm $(TESTNAME).ntar; \
+	LD_LIBRARY_PATH=$(ROOT_DIR) ./$(TESTNAME) 2>$(TESTNAME).txt; \
+	diff $(TESTNAME).txt $(TESTNAME).expected; \
+	test "$$?" -eq 0 || exit 1; 
+
 clean:
-	rm -f $(TESTNAME) *.o core
\ No newline at end of file
+	rm -f $(TESTNAME) *.o core .ntar
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test002/test002.c ntar-dev/tests/test002/test002.c
--- ntar/tests/test002/test002.c	2005-07-10 03:49:00.000000000 +0200
+++ ntar-dev/tests/test002/test002.c	2007-01-15 20:03:36.000000000 +0100
@@ -1,3 +1,6 @@
+#include<stdio.h>
+#include<stdlib.h>
+
 #include <ntar.h>
 
 int main()
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test002/test002.expected ntar-dev/tests/test002/test002.expected
--- ntar/tests/test002/test002.expected	1970-01-01 01:00:00.000000000 +0100
+++ ntar-dev/tests/test002/test002.expected	2007-01-15 20:41:42.000000000 +0100
@@ -0,0 +1,6 @@
+File created
+Section created
+Block created
+Block closed
+Section closed
+File closed
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test003/Makefile ntar-dev/tests/test003/Makefile
--- ntar/tests/test003/Makefile	2005-06-17 23:32:25.000000000 +0200
+++ ntar-dev/tests/test003/Makefile	2007-01-16 00:01:30.000000000 +0100
@@ -1,9 +1,18 @@
-CFLAGS = -I ../..
-LIBS = -lntar
+ROOT_DIR=../..
+CFLAGS = -I $(ROOT_DIR)
+LIBS = -lntar -L$(ROOT_DIR)
 TESTNAME = test003
 
+all: $(TESTNAME)
+
 $(TESTNAME): $(TESTNAME).c
 	$(CC) $(CFLAGS) $(TESTNAME).c $(LIBS) -o $@
 
+check: $(TESTNAME)
+	test -f $(TESTNAME).ntar && rm $(TESTNAME).ntar; \
+	LD_LIBRARY_PATH=$(ROOT_DIR) ./$(TESTNAME) 2>$(TESTNAME).txt; \
+	diff $(TESTNAME).txt $(TESTNAME).expected; \
+	test "$$?" -eq 0 || exit 1; 
+
 clean:
-	rm -f $(TESTNAME) *.o core
\ No newline at end of file
+	rm -f $(TESTNAME) *.o core .ntar
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test003/test003.expected ntar-dev/tests/test003/test003.expected
--- ntar/tests/test003/test003.expected	1970-01-01 01:00:00.000000000 +0100
+++ ntar-dev/tests/test003/test003.expected	2007-01-15 20:41:54.000000000 +0100
@@ -0,0 +1,6 @@
+File created
+Section created
+Block created
+Block closed
+Section closed
+File closed
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test004/Makefile ntar-dev/tests/test004/Makefile
--- ntar/tests/test004/Makefile	2005-06-17 23:32:10.000000000 +0200
+++ ntar-dev/tests/test004/Makefile	2007-01-16 00:02:53.000000000 +0100
@@ -1,9 +1,18 @@
-CFLAGS = -I ../..
-LIBS = -lntar
+ROOT_DIR=../..
+CFLAGS = -I $(ROOT_DIR)
+LIBS = -lntar -L$(ROOT_DIR)
 TESTNAME = test004
 
+all: $(TESTNAME)
+
 $(TESTNAME): $(TESTNAME).c
 	$(CC) $(CFLAGS) $(TESTNAME).c $(LIBS) -o $@
 
+check: $(TESTNAME)
+	test -f $(TESTNAME).ntar && rm $(TESTNAME).ntar; \
+	LD_LIBRARY_PATH=$(ROOT_DIR) ./$(TESTNAME) 2>$(TESTNAME).txt; \
+	diff $(TESTNAME).txt $(TESTNAME).expected; \
+	test "$$?" -eq 0 || exit 1; 
+
 clean:
-	rm -f $(TESTNAME) *.o core
\ No newline at end of file
+	rm -f $(TESTNAME) *.o core .ntar
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test004/test004.expected ntar-dev/tests/test004/test004.expected
--- ntar/tests/test004/test004.expected	1970-01-01 01:00:00.000000000 +0100
+++ ntar-dev/tests/test004/test004.expected	2007-01-15 20:42:07.000000000 +0100
@@ -0,0 +1,6 @@
+File opened
+Section created
+Added section option
+Added section option
+Section closed
+File closed
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test005/Makefile ntar-dev/tests/test005/Makefile
--- ntar/tests/test005/Makefile	2005-06-17 23:31:53.000000000 +0200
+++ ntar-dev/tests/test005/Makefile	2007-01-16 00:02:59.000000000 +0100
@@ -1,9 +1,18 @@
-CFLAGS = -I ../..
-LIBS = -lntar
+ROOT_DIR=../..
+CFLAGS = -I $(ROOT_DIR)
+LIBS = -lntar -L$(ROOT_DIR)
 TESTNAME = test005
 
+all: $(TESTNAME)
+
 $(TESTNAME): $(TESTNAME).c
 	$(CC) $(CFLAGS) $(TESTNAME).c $(LIBS) -o $@
 
+check: $(TESTNAME)
+	test -f $(TESTNAME).ntar && rm $(TESTNAME).ntar; \
+	LD_LIBRARY_PATH=$(ROOT_DIR) ./$(TESTNAME) 2>$(TESTNAME).txt; \
+	diff $(TESTNAME).txt $(TESTNAME).expected; \
+	test "$$?" -eq 0 || exit 1; 
+
 clean:
-	rm -f $(TESTNAME) *.o core
\ No newline at end of file
+	rm -f $(TESTNAME) *.o core .ntar
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test005/test005.expected ntar-dev/tests/test005/test005.expected
--- ntar/tests/test005/test005.expected	1970-01-01 01:00:00.000000000 +0100
+++ ntar-dev/tests/test005/test005.expected	2007-01-15 20:42:19.000000000 +0100
@@ -0,0 +1,8 @@
+File created
+Section created
+Block created
+Added block option
+Added block option
+Block closed
+Section closed
+File closed
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test006/Makefile ntar-dev/tests/test006/Makefile
--- ntar/tests/test006/Makefile	2005-06-17 23:31:40.000000000 +0200
+++ ntar-dev/tests/test006/Makefile	2007-01-16 00:03:01.000000000 +0100
@@ -1,9 +1,18 @@
-CFLAGS = -I ../..
-LIBS = -lntar
+ROOT_DIR=../..
+CFLAGS = -I $(ROOT_DIR)
+LIBS = -lntar -L$(ROOT_DIR)
 TESTNAME = test006
 
+all: $(TESTNAME)
+
 $(TESTNAME): $(TESTNAME).c
 	$(CC) $(CFLAGS) $(TESTNAME).c $(LIBS) -o $@
 
+check: $(TESTNAME)
+	test -f $(TESTNAME).ntar && rm $(TESTNAME).ntar; \
+	LD_LIBRARY_PATH=$(ROOT_DIR) ./$(TESTNAME) 2>$(TESTNAME).txt; \
+	diff $(TESTNAME).txt $(TESTNAME).expected; \
+	test "$$?" -eq 0 || exit 1; 
+
 clean:
-	rm -f $(TESTNAME) *.o core
\ No newline at end of file
+	rm -f $(TESTNAME) *.o core .ntar
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test006/test006.expected ntar-dev/tests/test006/test006.expected
--- ntar/tests/test006/test006.expected	1970-01-01 01:00:00.000000000 +0100
+++ ntar-dev/tests/test006/test006.expected	2007-01-15 20:42:34.000000000 +0100
@@ -0,0 +1,11 @@
+File created
+Section created
+Block created
+Added block option
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Section closed
+File closed
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test007/Makefile ntar-dev/tests/test007/Makefile
--- ntar/tests/test007/Makefile	2005-06-17 23:31:21.000000000 +0200
+++ ntar-dev/tests/test007/Makefile	2007-01-16 00:03:04.000000000 +0100
@@ -1,9 +1,18 @@
-CFLAGS = -I ../..
-LIBS = -lntar
+ROOT_DIR=../..
+CFLAGS = -I $(ROOT_DIR)
+LIBS = -lntar -L$(ROOT_DIR)
 TESTNAME = test007
 
+all: $(TESTNAME)
+
 $(TESTNAME): $(TESTNAME).c
 	$(CC) $(CFLAGS) $(TESTNAME).c $(LIBS) -o $@
 
+check: $(TESTNAME)
+	test -f $(TESTNAME).ntar && rm $(TESTNAME).ntar; \
+	LD_LIBRARY_PATH=$(ROOT_DIR) ./$(TESTNAME) 2>$(TESTNAME).txt; \
+	diff $(TESTNAME).txt $(TESTNAME).expected; \
+	test "$$?" -eq 0 || exit 1; 
+
 clean:
-	rm -f $(TESTNAME) *.o core
\ No newline at end of file
+	rm -f $(TESTNAME) *.o core .ntar
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test007/test007.expected ntar-dev/tests/test007/test007.expected
--- ntar/tests/test007/test007.expected	1970-01-01 01:00:00.000000000 +0100
+++ ntar-dev/tests/test007/test007.expected	2007-01-15 20:42:47.000000000 +0100
@@ -0,0 +1,10 @@
+File created
+Section created
+Block created
+Block option added
+Added block option
+Block closed
+Block created
+Block closed
+Section closed
+File closed
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test008/Makefile ntar-dev/tests/test008/Makefile
--- ntar/tests/test008/Makefile	2005-06-17 23:31:04.000000000 +0200
+++ ntar-dev/tests/test008/Makefile	2007-01-16 00:03:07.000000000 +0100
@@ -1,9 +1,17 @@
-CFLAGS = -I ../..
-LIBS = -lntar
+ROOT_DIR=../..
+CFLAGS = -I $(ROOT_DIR)
+LIBS = -lntar -L$(ROOT_DIR)
 TESTNAME = test008
 
+all: $(TESTNAME)
+
 $(TESTNAME): $(TESTNAME).c
 	$(CC) $(CFLAGS) $(TESTNAME).c $(LIBS) -o $@
 
+check: $(TESTNAME)
+	LD_LIBRARY_PATH=$(ROOT_DIR) ./$(TESTNAME) 2>$(TESTNAME).txt; \
+	diff $(TESTNAME).txt $(TESTNAME).expected; \
+	test "$$?" -eq 0 || exit 1; 
+
 clean:
-	rm -f $(TESTNAME) *.o core
\ No newline at end of file
+	rm -f $(TESTNAME) *.o core
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test008/test008.expected ntar-dev/tests/test008/test008.expected
--- ntar/tests/test008/test008.expected	1970-01-01 01:00:00.000000000 +0100
+++ ntar-dev/tests/test008/test008.expected	2007-01-15 20:48:41.000000000 +0100
@@ -0,0 +1,8 @@
+File opened
+Section opened
+Block opened
+Block closed
+Block opened
+Block closed
+Section closed
+File closed
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test008/test009.expected ntar-dev/tests/test008/test009.expected
--- ntar/tests/test008/test009.expected	1970-01-01 01:00:00.000000000 +0100
+++ ntar-dev/tests/test008/test009.expected	2007-01-15 20:44:12.000000000 +0100
@@ -0,0 +1 @@
+bash: ./test009: Aucun fichier ou répertoire de ce type
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test009/Makefile ntar-dev/tests/test009/Makefile
--- ntar/tests/test009/Makefile	2005-06-17 23:30:45.000000000 +0200
+++ ntar-dev/tests/test009/Makefile	2007-01-16 00:03:17.000000000 +0100
@@ -1,9 +1,17 @@
-CFLAGS = -I ../..
-LIBS = -lntar
+ROOT_DIR=../..
+CFLAGS = -I $(ROOT_DIR)
+LIBS = -lntar -L$(ROOT_DIR)
 TESTNAME = test009
 
+all: $(TESTNAME)
+
 $(TESTNAME): $(TESTNAME).c
 	$(CC) $(CFLAGS) $(TESTNAME).c $(LIBS) -o $@
 
+check: $(TESTNAME)
+	LD_LIBRARY_PATH=$(ROOT_DIR) ./$(TESTNAME) 2>$(TESTNAME).txt; \
+	diff $(TESTNAME).txt $(TESTNAME).expected; \
+	test "$$?" -eq 0 || exit 1; 
+
 clean:
-	rm -f $(TESTNAME) *.o core
\ No newline at end of file
+	rm -f $(TESTNAME) *.o core
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test009/test009.expected ntar-dev/tests/test009/test009.expected
--- ntar/tests/test009/test009.expected	1970-01-01 01:00:00.000000000 +0100
+++ ntar-dev/tests/test009/test009.expected	2007-01-15 20:48:42.000000000 +0100
@@ -0,0 +1,8 @@
+File opened
+Section opened
+Block opened
+Block closed
+Block opened
+Block closed
+Section closed
+File closed
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test010/Makefile ntar-dev/tests/test010/Makefile
--- ntar/tests/test010/Makefile	2005-06-17 23:30:29.000000000 +0200
+++ ntar-dev/tests/test010/Makefile	2007-01-16 00:03:28.000000000 +0100
@@ -1,9 +1,17 @@
-CFLAGS = -I ../..
-LIBS = -lntar
+ROOT_DIR=../..
+CFLAGS = -I $(ROOT_DIR)
+LIBS = -lntar -L$(ROOT_DIR)
 TESTNAME = test010
 
+all: $(TESTNAME)
+
 $(TESTNAME): $(TESTNAME).c
 	$(CC) $(CFLAGS) $(TESTNAME).c $(LIBS) -o $@
 
+check: $(TESTNAME)
+	LD_LIBRARY_PATH=$(ROOT_DIR) ./$(TESTNAME) 2>$(TESTNAME).txt; \
+	diff $(TESTNAME).txt $(TESTNAME).expected; \
+	test "$$?" -eq 0 || exit 1; 
+
 clean:
-	rm -f $(TESTNAME) *.o core
\ No newline at end of file
+	rm -f $(TESTNAME) *.o core 
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test010/test010.expected ntar-dev/tests/test010/test010.expected
--- ntar/tests/test010/test010.expected	1970-01-01 01:00:00.000000000 +0100
+++ ntar-dev/tests/test010/test010.expected	2007-01-15 20:53:54.000000000 +0100
@@ -0,0 +1,11 @@
+File opened
+Section opened
+Block opened
+Retrieved block type
+Snaplen 96 - linktype 2
+Block closed
+Block opened
+Retrieved block type
+Block closed
+Section closed
+File closed
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test011/Makefile ntar-dev/tests/test011/Makefile
--- ntar/tests/test011/Makefile	2005-06-17 23:30:14.000000000 +0200
+++ ntar-dev/tests/test011/Makefile	2007-01-16 00:03:31.000000000 +0100
@@ -1,9 +1,17 @@
-CFLAGS = -I ../..
-LIBS = -lntar
+ROOT_DIR=../..
+CFLAGS = -I $(ROOT_DIR)
+LIBS = -lntar -L$(ROOT_DIR)
 TESTNAME = test011
 
+all: $(TESTNAME)
+
 $(TESTNAME): $(TESTNAME).c
 	$(CC) $(CFLAGS) $(TESTNAME).c $(LIBS) -o $@
 
+check: $(TESTNAME)
+	LD_LIBRARY_PATH=$(ROOT_DIR) ./$(TESTNAME) 2>$(TESTNAME).txt; \
+	diff $(TESTNAME).txt $(TESTNAME).expected; \
+	test "$$?" -eq 0 || exit 1; 
+
 clean:
-	rm -f $(TESTNAME) *.o core
\ No newline at end of file
+	rm -f $(TESTNAME) *.o core 
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test011/test011.expected ntar-dev/tests/test011/test011.expected
--- ntar/tests/test011/test011.expected	1970-01-01 01:00:00.000000000 +0100
+++ ntar-dev/tests/test011/test011.expected	2007-01-15 20:53:57.000000000 +0100
@@ -0,0 +1,18 @@
+File opened
+Section opened
+Section options retrieved
+Option code 1
+Block opened
+Retrieved block type
+Snaplen 124 - linktype 1240
+Block closed
+Section closed
+Section opened
+Section options retrieved
+Option code 1
+Block opened
+Retrieved block type
+Snaplen 124 - linktype 1240
+Block closed
+Section closed
+File closed
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test012/Makefile ntar-dev/tests/test012/Makefile
--- ntar/tests/test012/Makefile	2005-06-17 23:30:00.000000000 +0200
+++ ntar-dev/tests/test012/Makefile	2007-01-16 00:03:34.000000000 +0100
@@ -1,9 +1,18 @@
-CFLAGS = -I ../..
-LIBS = -lntar
+ROOT_DIR=../..
+CFLAGS = -I $(ROOT_DIR)
+LIBS = -lntar -L$(ROOT_DIR)
 TESTNAME = test012
 
+all: $(TESTNAME)
+
 $(TESTNAME): $(TESTNAME).c
 	$(CC) $(CFLAGS) $(TESTNAME).c $(LIBS) -o $@
 
+check: $(TESTNAME)
+	test -f $(TESTNAME).ntar && rm $(TESTNAME).ntar; \
+	LD_LIBRARY_PATH=$(ROOT_DIR) ./$(TESTNAME) 2>$(TESTNAME).txt; \
+	diff $(TESTNAME).txt $(TESTNAME).expected; \
+	test "$$?" -eq 0 || exit 1; 
+
 clean:
-	rm -f $(TESTNAME) *.o core
\ No newline at end of file
+	rm -f $(TESTNAME) *.o core .ntar
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test012/test012.expected ntar-dev/tests/test012/test012.expected
--- ntar/tests/test012/test012.expected	1970-01-01 01:00:00.000000000 +0100
+++ ntar-dev/tests/test012/test012.expected	2007-01-15 20:53:59.000000000 +0100
@@ -0,0 +1,9 @@
+File created.
+Section created
+Section option added
+Block created
+Block option added
+Block option added
+Block closed
+Section closed
+File closed
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test013/Makefile ntar-dev/tests/test013/Makefile
--- ntar/tests/test013/Makefile	2005-06-17 23:29:40.000000000 +0200
+++ ntar-dev/tests/test013/Makefile	2007-01-16 00:03:37.000000000 +0100
@@ -1,9 +1,17 @@
-CFLAGS = -I ../..
-LIBS = -lntar
+ROOT_DIR=../..
+CFLAGS = -I $(ROOT_DIR)
+LIBS = -lntar -L$(ROOT_DIR)
 TESTNAME = test013
 
+all: $(TESTNAME)
+
 $(TESTNAME): $(TESTNAME).c
 	$(CC) $(CFLAGS) $(TESTNAME).c $(LIBS) -o $@
 
+check: $(TESTNAME)
+	LD_LIBRARY_PATH=$(ROOT_DIR) ./$(TESTNAME) 2>$(TESTNAME).txt; \
+	diff $(TESTNAME).txt $(TESTNAME).expected; \
+	test "$$?" -eq 0 || exit 1; 
+
 clean:
-	rm -f $(TESTNAME) *.o core
\ No newline at end of file
+	rm -f $(TESTNAME) *.o core 
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test013/test013.expected ntar-dev/tests/test013/test013.expected
--- ntar/tests/test013/test013.expected	1970-01-01 01:00:00.000000000 +0100
+++ ntar-dev/tests/test013/test013.expected	2007-01-15 20:54:00.000000000 +0100
@@ -0,0 +1,20 @@
+File opened
+Section opened
+Block opened
+Retrieved block type
+Snaplen 124 - linktype 1240
+Block options retrieved
+Option code 3
+Option code 8
+Block closed
+Section closed
+Section opened
+Block opened
+Retrieved block type
+Snaplen 124 - linktype 1240
+Block options retrieved
+Option code 3
+Option code 8
+Block closed
+Section closed
+File closed
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test014/Makefile ntar-dev/tests/test014/Makefile
--- ntar/tests/test014/Makefile	2005-06-17 23:29:17.000000000 +0200
+++ ntar-dev/tests/test014/Makefile	2007-01-16 00:03:40.000000000 +0100
@@ -1,9 +1,18 @@
-CFLAGS = -I ../..
-LIBS = -lntar
+ROOT_DIR=../..
+CFLAGS = -I $(ROOT_DIR)
+LIBS = -lntar -L$(ROOT_DIR)
 TESTNAME = test014
 
+all: $(TESTNAME)
+
 $(TESTNAME): $(TESTNAME).c
 	$(CC) $(CFLAGS) $(TESTNAME).c $(LIBS) -o $@
 
+check: $(TESTNAME)
+	test -f $(TESTNAME).ntar && rm $(TESTNAME).ntar; \
+	LD_LIBRARY_PATH=$(ROOT_DIR) ./$(TESTNAME) 2>$(TESTNAME).txt; \
+	diff $(TESTNAME).txt $(TESTNAME).expected; \
+	test "$$?" -eq 0 || exit 1; 
+
 clean:
-	rm -f $(TESTNAME) *.o core
\ No newline at end of file
+	rm -f $(TESTNAME) *.o core .ntar
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test014/test014.expected ntar-dev/tests/test014/test014.expected
--- ntar/tests/test014/test014.expected	1970-01-01 01:00:00.000000000 +0100
+++ ntar-dev/tests/test014/test014.expected	2007-01-15 20:54:03.000000000 +0100
@@ -0,0 +1,3008 @@
+File created
+Section created
+Block created
+Added block option
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Block created
+Added block option
+Block closed
+Section closed
+File closed
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test015/Makefile ntar-dev/tests/test015/Makefile
--- ntar/tests/test015/Makefile	2005-06-17 23:29:01.000000000 +0200
+++ ntar-dev/tests/test015/Makefile	2007-01-16 00:03:43.000000000 +0100
@@ -1,9 +1,17 @@
-CFLAGS = -I ../..
-LIBS = -lntar
+ROOT_DIR=../..
+CFLAGS = -I $(ROOT_DIR)
+LIBS = -lntar -L$(ROOT_DIR)
 TESTNAME = test015
 
+all: $(TESTNAME)
+
 $(TESTNAME): $(TESTNAME).c
 	$(CC) $(CFLAGS) $(TESTNAME).c $(LIBS) -o $@
 
+check: $(TESTNAME)
+	LD_LIBRARY_PATH=$(ROOT_DIR) ./$(TESTNAME) 2>$(TESTNAME).txt; \
+	diff $(TESTNAME).txt $(TESTNAME).expected; \
+	test "$$?" -eq 0 || exit 1; 
+
 clean:
-	rm -f $(TESTNAME) *.o core
\ No newline at end of file
+	rm -f $(TESTNAME) *.o core 
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test015/test015.expected ntar-dev/tests/test015/test015.expected
--- ntar/tests/test015/test015.expected	1970-01-01 01:00:00.000000000 +0100
+++ ntar-dev/tests/test015/test015.expected	2007-01-15 20:54:08.000000000 +0100
@@ -0,0 +1,10 @@
+File opened
+Section opened
+Section options retrieved
+Option code 1
+Section closed
+Section opened
+Section options retrieved
+Option code 1
+Section closed
+File closed
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test016/Makefile ntar-dev/tests/test016/Makefile
--- ntar/tests/test016/Makefile	2005-06-17 23:28:42.000000000 +0200
+++ ntar-dev/tests/test016/Makefile	2007-01-16 00:03:52.000000000 +0100
@@ -1,9 +1,17 @@
-CFLAGS = -I ../..
-LIBS = -lntar
+ROOT_DIR=../..
+CFLAGS = -I $(ROOT_DIR)
+LIBS = -lntar -L$(ROOT_DIR)
 TESTNAME = test016
 
+all: $(TESTNAME)
+
 $(TESTNAME): $(TESTNAME).c
 	$(CC) $(CFLAGS) $(TESTNAME).c $(LIBS) -o $@
 
+check: $(TESTNAME)
+	export LD_LIBRARY_PATH=$(ROOT_DIR); cat test016_in.ntar | ./$(TESTNAME) 2>$(TESTNAME).txt; \
+	diff $(TESTNAME).txt $(TESTNAME).expected; \
+	test "$$?" -eq 0 || exit 1; 
+
 clean:
-	rm -f $(TESTNAME) *.o core
\ No newline at end of file
+	rm -f $(TESTNAME) *.o core
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test016/test016.expected ntar-dev/tests/test016/test016.expected
--- ntar/tests/test016/test016.expected	1970-01-01 01:00:00.000000000 +0100
+++ ntar-dev/tests/test016/test016.expected	2007-01-15 20:54:24.000000000 +0100
@@ -0,0 +1,10 @@
+File opened
+Section opened
+Section options retrieved
+Option code 1
+Section closed
+Section opened
+Section options retrieved
+Option code 1
+Section closed
+File closed
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test017/Makefile ntar-dev/tests/test017/Makefile
--- ntar/tests/test017/Makefile	2005-07-10 03:58:13.000000000 +0200
+++ ntar-dev/tests/test017/Makefile	2007-01-16 00:03:57.000000000 +0100
@@ -1,9 +1,17 @@
-CFLAGS = -I ../..
-LIBS = -lntar
+ROOT_DIR=../..
+CFLAGS = -I $(ROOT_DIR)
+LIBS = -lntar -L$(ROOT_DIR)
 TESTNAME = test017
 
+all: $(TESTNAME)
+
 $(TESTNAME): $(TESTNAME).c
 	$(CC) $(CFLAGS) $(TESTNAME).c $(LIBS) -o $@
 
+check: $(TESTNAME)
+	LD_LIBRARY_PATH=$(ROOT_DIR) ./$(TESTNAME) 2>$(TESTNAME).txt; \
+	diff $(TESTNAME).txt $(TESTNAME).expected; \
+	test "$$?" -eq 0 || exit 1; 
+
 clean:
-	rm -f $(TESTNAME) *.o core
\ No newline at end of file
+	rm -f $(TESTNAME) *.o core .ntar
diff -urN --strip-trailing-cr -X exc-ntar ntar/tests/test018/Makefile ntar-dev/tests/test018/Makefile
--- ntar/tests/test018/Makefile	2005-07-10 03:58:54.000000000 +0200
+++ ntar-dev/tests/test018/Makefile	2007-01-16 00:04:04.000000000 +0100
@@ -1,9 +1,17 @@
-CFLAGS = -I ../..
-LIBS = -lntar
+ROOT_DIR=../..
+CFLAGS = -I $(ROOT_DIR)
+LIBS = -lntar -L$(ROOT_DIR)
 TESTNAME = test018
 
+all: $(TESTNAME)
+
 $(TESTNAME): $(TESTNAME).c
 	$(CC) $(CFLAGS) $(TESTNAME).c $(LIBS) -o $@
 
+check: $(TESTNAME)
+	LD_LIBRARY_PATH=$(ROOT_DIR) ./$(TESTNAME) 2>$(TESTNAME).txt; \
+	diff $(TESTNAME).txt $(TESTNAME).expected; \
+	test "$$?" -eq 0 || exit 1; 
+
 clean:
-	rm -f $(TESTNAME) *.o core
\ No newline at end of file
+	rm -f $(TESTNAME) *.o core .ntar


More information about the ntar-workers mailing list