From f320f7fd3122d087fa064d3819d0181bcb580ac0 Mon Sep 17 00:00:00 2001 From: Colin Megill Date: Thu, 10 Jun 2021 17:28:51 -0700 Subject: [PATCH] copy gene sets separately --- client/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/client/Makefile b/client/Makefile index 32110ec9..ec61f272 100644 --- a/client/Makefile +++ b/client/Makefile @@ -1,7 +1,8 @@ include ../common.mk -TEST_CSVS := $(if $(ANNOTATIONS),$(ANNOTATIONS),../backend/test/fixtures/{pbmc3k-annotations.csv,pbmc3k-genesets.csv}) -ANNOTATIONS_FILENAME := $(shell basename $(ANNOTATIONS)) +ANNOTATIONS := $(if $(ANNOTATIONS),$(ANNOTATIONS),../backend/test/fixtures/pbmc3k-annotations.csv) +GENE_SETS := $(if $(ANNOTATIONS),$(ANNOTATIONS),../backend/test/fixtures/pbmc3k-genesets.csv) +ANNOTATIONS_FILENAME := $(shell basename $(TEST_CSVS)) CXG_CONFIG := $(if $(CXG_CONFIG), $(CXG_CONFIG), ./__tests__/e2e/test_config.yaml) @@ -41,7 +42,8 @@ smoke-test: .PHONY: smoke-test-annotations smoke-test-annotations: $(eval TMP_DIR := $(shell mktemp -d /tmp/cellxgene_XXXXXX)) - cp $(TEST_CSVS) $(TMP_DIR)/ && \ + cp $(ANNOTATIONS) $(TMP_DIR)/ && \ + cp $(GENE_SETS) $(TMP_DIR)/ && \ start_server_and_test \ 'CXG_OPTIONS="--annotations-file $(TMP_DIR)/$(ANNOTATIONS_FILENAME)" $(MAKE) start-server' \ $(CXG_SERVER_PORT) \