Fix test for consolidation (related to #3)

NatLibFi · Nov 13, 2017 · d5c17a1 · d5c17a1
1 parent e49deea
commit d5c17a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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