From d5c17a1ae2a117a204f8117e11f71212cc30e500 Mon Sep 17 00:00:00 2001 From: Osma Suominen Date: Mon, 13 Nov 2017 15:23:56 +0200 Subject: [PATCH] Fix test for consolidation (related to #3) --- Makefile | 4 ++-- test/60_consolidate.bats | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c76b48a..9dd8ade 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,7 @@ merged/%-merged.nt: $$(shell ls slices/$$(*)-?????-in.alephseq | sed -e 's/-in.a rm -f $@.index* $(HDTSEARCH) -q 0 $@ -output/%.nt: merged/%-rewritten.hdt +output/%.nt: merged/%-merged.hdt JAVA_OPTIONS=$(JVMARGS) $(HDTSPARQL) $^ "`cat sparql/consolidate-works.rq`" >$@ # Targets to be run externally @@ -132,7 +132,7 @@ reconcile: $(patsubst %-in.alephseq,%-reconciled.nt,$(wildcard slices/*-in.aleph merge: $(patsubst input/%.alephseq,merged/%-merged.nt,$(wildcard input/*.alephseq)) -consolidate: $(patsubst input/%.alephseq,output/%.hdt,$(wildcard input/*.alephseq)) +consolidate: $(patsubst input/%.alephseq,output/%.nt,$(wildcard input/*.alephseq)) .PHONY: all realclean clean slice preprocess mrcx rdf rewrite work-keys schema merge consolidate .DEFAULT_GOAL := all diff --git a/test/60_consolidate.bats b/test/60_consolidate.bats index b438cc5..0782e9f 100644 --- a/test/60_consolidate.bats +++ b/test/60_consolidate.bats @@ -8,6 +8,7 @@ setup () { } @test "Consolidate works: basic consolidation" { + skip "not implemented, see https://github.com/NatLibFi/bib-rdf-pipeline/issues/3" rm -f output/hawking.nt rm -f output/hawking.hdt make -j2 consolidate