Skip to content

Commit 1a2454a

Browse files
committed
Add copy of monolithic CASE build for a UCO test
UCO Issue 393 added a test that assumed a file's existence during the UCO CI. That file is the UCO monolithic build, a purposefully Git- ignored build artifact. `case-utils` currently repurposes the UCO `pytest` script to ensure UCO's tests also pass when substituting the monolithic build of CASE. With Issue 393, the file reference to the UCO monolithic build needs to be handled downstream in `case-utils`. This patch adds that file by making a copy as a Git-ignored file. (A soft link could cause potential confusion due to management of the modification timestamp on the monolithic build file.) References: * ucoProject/UCO#393 * [ONT-295] Release CASE 1.0.0 Signed-off-by: Alex Nelson <[email protected]>
1 parent 3cc7c59 commit 1a2454a

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uco_monolithic.ttl

tests/case_utils/case_validate/Makefile

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ SHELL := /bin/bash
1515

1616
top_srcdir := $(shell cd ../../.. ; pwd)
1717

18+
case_version := $(shell $(PYTHON3) $(top_srcdir)/case_utils/ontology/version_info.py)
19+
ifeq ($(case_version),)
20+
$(error Unable to determine CASE version)
21+
endif
22+
1823
tests_srcdir := $(top_srcdir)/tests
1924

2025
all: \
@@ -57,7 +62,8 @@ check-cli:
5762
--directory cli \
5863
check
5964

60-
check-uco_test_examples:
65+
check-uco_test_examples: \
66+
uco_monolithic.ttl
6167
$(MAKE) \
6268
--directory uco_test_examples \
6369
check
@@ -72,3 +78,17 @@ clean:
7278
@$(MAKE) \
7379
--directory cli \
7480
clean
81+
82+
# This file is necessary for a UCO unit test that case-utils runs
83+
# substituting its own monolithic build.
84+
# It is incorrect to designate this the "UCO" monolithic build due to
85+
# CASE concepts being present, but using the CASE build here keeps with
86+
# the spirit of confirming UCO tests continue to pass when using the
87+
# CASE monolithic build.
88+
uco_monolithic.ttl: \
89+
$(top_srcdir)/case_utils/ontology/version_info.py \
90+
$(top_srcdir)/case_utils/ontology/case-$(case_version).ttl
91+
rm -f $@
92+
cp \
93+
$(top_srcdir)/case_utils/ontology/case-$(case_version).ttl \
94+
$@

0 commit comments

Comments
 (0)