Timerix/utf8proc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

directory cleanup: move tests and data into subdirectories

Browse Source
This commit is contained in:
Steven G. Johnson
2015-03-06 17:36:08 -05:00
parent 10f7e2ed5a
commit 90721f2d39
6 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+25 -25
View File
@@ -25,7 +25,7 @@ all: c-library
c-library: libutf8proc.a libutf8proc.$(SHLIB_EXT) c-library: libutf8proc.a libutf8proc.$(SHLIB_EXT)
clean: clean:
rm -f utf8proc.o libutf8proc.a libutf8proc.$(SHLIB_EXT) normtest graphemetest UnicodeData.txt DerivedCoreProperties.txt CompositionExclusions.txt CaseFolding.txt NormalizationTest.txt GraphemeBreakTest.txt rm -f utf8proc.o libutf8proc.a libutf8proc.$(SHLIB_EXT) test/normtest test/graphemetest data/UnicodeData.txt data/DerivedCoreProperties.txt data/CompositionExclusions.txt data/CaseFolding.txt data/NormalizationTest.txt data/GraphemeBreakTest.txt
$(MAKE) -C bench clean $(MAKE) -C bench clean
update: utf8proc_data.c.new update: utf8proc_data.c.new
@@ -33,23 +33,23 @@ update: utf8proc_data.c.new
# real targets # real targets
utf8proc_data.c.new: data_generator.rb UnicodeData.txt GraphemeBreakProperty.txt DerivedCoreProperties.txt CompositionExclusions.txt CaseFolding.txt utf8proc_data.c.new: data/data_generator.rb data/UnicodeData.txt data/GraphemeBreakProperty.txt data/DerivedCoreProperties.txt data/CompositionExclusions.txt data/CaseFolding.txt
$(RUBY) data_generator.rb < UnicodeData.txt > utf8proc_data.c.new (cd data; $(RUBY) data_generator.rb < UnicodeData.txt) > utf8proc_data.c.new
UnicodeData.txt: data/UnicodeData.txt:
$(CURL) -O http://www.unicode.org/Public/UNIDATA/UnicodeData.txt $(CURL) -o $@ -O http://www.unicode.org/Public/UNIDATA/UnicodeData.txt
GraphemeBreakProperty.txt: data/GraphemeBreakProperty.txt:
$(CURL) -O http://www.unicode.org/Public/UCD/latest/ucd/auxiliary/GraphemeBreakProperty.txt $(CURL) -o $@ -O http://www.unicode.org/Public/UCD/latest/ucd/auxiliary/GraphemeBreakProperty.txt
DerivedCoreProperties.txt: data/DerivedCoreProperties.txt:
$(CURL) -O http://www.unicode.org/Public/UNIDATA/DerivedCoreProperties.txt $(CURL) -o $@ -O http://www.unicode.org/Public/UNIDATA/DerivedCoreProperties.txt
CompositionExclusions.txt: data/CompositionExclusions.txt:
$(CURL) -O http://www.unicode.org/Public/UNIDATA/CompositionExclusions.txt $(CURL) -o $@ -O http://www.unicode.org/Public/UNIDATA/CompositionExclusions.txt
CaseFolding.txt: data/CaseFolding.txt:
$(CURL) -O http://www.unicode.org/Public/UNIDATA/CaseFolding.txt $(CURL) -o $@ -O http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
utf8proc.o: utf8proc.h utf8proc.c utf8proc_data.c utf8proc.o: utf8proc.h utf8proc.c utf8proc_data.c
$(cc) -c -o utf8proc.o utf8proc.c $(cc) -c -o utf8proc.o utf8proc.c
@@ -68,21 +68,21 @@ libutf8proc.dylib: utf8proc.o
# Test programs # Test programs
NormalizationTest.txt: data/NormalizationTest.txt:
$(CURL) -O http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt $(CURL) -o $@ -O http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt
GraphemeBreakTest.txt: data/GraphemeBreakTest.txt:
$(CURL) http://www.unicode.org/Public/UCD/latest/ucd/auxiliary/GraphemeBreakTest.txt | $(PERL) -pe 's,÷,/,g;s,×,+,g' > $@ $(CURL) http://www.unicode.org/Public/UCD/latest/ucd/auxiliary/GraphemeBreakTest.txt | $(PERL) -pe 's,÷,/,g;s,×,+,g' > $@
normtest: normtest.c utf8proc.o utf8proc.h tests.h test/normtest: test/normtest.c utf8proc.o utf8proc.h test/tests.h
$(cc) normtest.c utf8proc.o -o $@ $(cc) test/normtest.c utf8proc.o -o $@
graphemetest: graphemetest.c utf8proc.o utf8proc.h tests.h test/graphemetest: test/graphemetest.c utf8proc.o utf8proc.h test/tests.h
$(cc) graphemetest.c utf8proc.o -o $@ $(cc) test/graphemetest.c utf8proc.o -o $@
printproperty: printproperty.c utf8proc.o utf8proc.h tests.h test/printproperty: test/printproperty.c utf8proc.o utf8proc.h test/tests.h
$(cc) printproperty.c utf8proc.o -o $@ $(cc) test/printproperty.c utf8proc.o -o $@
check: normtest NormalizationTest.txt graphemetest GraphemeBreakTest.txt check: test/normtest data/NormalizationTest.txt test/graphemetest data/GraphemeBreakTest.txt
./normtest test/normtest data/NormalizationTest.txt
./graphemetest test/graphemetest data/GraphemeBreakTest.txt
data_generator.rb → data/data_generator.rb
View File
graphemetest.c → test/graphemetest.c
+2 -2
View File
@@ -1,10 +1,10 @@
#include "tests.h" #include "tests.h"
int main(void) int main(int argc, char **argv)
{ {
char *buf = NULL; char *buf = NULL;
size_t bufsize = 0; size_t bufsize = 0;
FILE *f = fopen("GraphemeBreakTest.txt", "r"); FILE *f = argc > 1 ? fopen(argv[1], "r") : NULL;
uint8_t src[1024]; uint8_t src[1024];
check(f != NULL, "error opening GraphemeBreakTest.txt"); check(f != NULL, "error opening GraphemeBreakTest.txt");
normtest.c → test/normtest.c
+2 -2
View File
@@ -7,11 +7,11 @@
free(src_norm); \ free(src_norm); \
} }
int main(void) int main(int argc, char **argv)
{ {
char *buf = NULL; char *buf = NULL;
size_t bufsize = 0; size_t bufsize = 0;
FILE *f = fopen("NormalizationTest.txt", "r"); FILE *f = argc > 1 ? fopen(argv[1], "r") : NULL;
char source[1024], NFC[1024], NFD[1024], NFKC[1024], NFKD[1024]; char source[1024], NFC[1024], NFD[1024], NFKC[1024], NFKD[1024];
check(f != NULL, "error opening NormalizationTest.txt"); check(f != NULL, "error opening NormalizationTest.txt");
printproperty.c → test/printproperty.c
View File
tests.h → test/tests.h
+1 -1
View File
@@ -6,7 +6,7 @@
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#include "utf8proc.h" #include "../utf8proc.h"
size_t lineno = 0; size_t lineno = 0;