Remove dependency on clm fork also for interworking tests

.gitlab-ci.yml

@@ -12,6 +12,7 @@ stages:
     - ln -s "$PWD/src/bclink" /opt/clean/lib/exe/bclink
     - ln -s "$PWD/src/bcprelink" /opt/clean/lib/exe/bcprelink
     - ln -s "$PWD/src/bcstrip" /opt/clean/lib/exe/bcstrip
+    - sed -i '/^import code from library/d' lib/ABC/Interpreter/Util.icl
     - make -C src
 
 build:

Dockerfile

@@ -26,3 +26,5 @@ RUN apt-get install -y -qq --no-install-recommends curl unzip libnspr4 &&\
 	rm -r /tmp/jsshell
 
 RUN	install_clean_nightly.sh base lib-argenv lib-directory lib-dynamics lib-graphcopy lib-platform lib-stdlib
+
+RUN sed -i 's%lib/exe/linker%/usr/bin/gcc:--gc-sections%' /opt/clean/etc/IDEEnvs

test/CodeSharing.prj.default

+Version: 1.5
+Global
+	ProjectRoot:	.
+	Target:	StdEnv
+	Exec:	{Project}*CodeSharing
+	ByteCode:	{Project}*CodeSharing.bc
+	CodeGen
+		CheckStacks:	False
+		CheckIndexes:	True
+		OptimiseABC:	False
+		GenerateByteCode:	False
+	Application
+		HeapSize:	2097152
+		StackSize:	512000
+		ExtraMemory:	8192
+		IntialHeapSize:	204800
+		HeapSizeMultiplier:	4096
+		ShowExecutionTime:	False
+		ShowGC:	False
+		ShowStackSize:	False
+		MarkingCollector:	False
+		DisableRTSFlags:	False
+		StandardRuntimeEnv:	True
+		Profile
+			Memory:	False
+			MemoryMinimumHeapSize:	0
+			Time:	False
+			Stack:	False
+			Dynamics:	False
+			GenericFusion:	False
+			DescExL:	False
+		Output
+			Output:	ShowConstructors
+			Font:	Monaco
+			FontSize:	9
+			WriteStdErr:	False
+	Link
+		LinkMethod:	Static
+		GenerateRelocations:	False
+		GenerateSymbolTable:	True
+		GenerateLinkMap:	False
+		LinkResources:	False
+		ResourceSource:	
+		GenerateDLL:	False
+		ExportedNames:	
+		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	False
+	Paths
+		Path:	{Project}
+		Path:	{Project}*..*lib
+		Path:	{Application}*lib*GraphCopy
+		Path:	{Application}*lib*Platform
+	Precompile:	
+	Postlink:	
+MainModule
+	Name:	CodeSharing
+	Dir:	{Project}
+	Compiler
+		NeverMemoryProfile:	False
+		NeverTimeProfile:	False
+		StrictnessAnalysis:	True
+		ListTypes:	StrictExportTypes
+		ListAttributes:	True
+		Warnings:	True
+		Verbose:	True
+		ReadableABC:	False
+		ReuseUniqueNodes:	True
+		Fusion:	False

test/GraphTest_win.prj.default → test/GraphTest.prj.default

@@ -2,8 +2,8 @@ Version: 1.4
 Global
 	ProjectRoot:	.
 	Target:	StdEnv
-	Exec:	{Project}\GraphTest.exe
-	ByteCode:	{Project}\GraphTest.bc
+	Exec:	{Project}*GraphTest
+	ByteCode:	{Project}*GraphTest.bc
 	CodeGen
 		CheckStacks:	False
 		CheckIndexes:	True
@@ -43,11 +43,14 @@ Global
 		ResourceSource:	
 		GenerateDLL:	False
 		ExportedNames:	
+		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	False
 	Paths
 		Path:	{Project}
-		Path:	{Project}*..*src
-		Path:	{Application}*Libraries*GraphCopy
-		Path:	{Application}*Libraries*Platform
+		Path:	{Project}*..*lib
+		Path:	{Application}*lib*GraphCopy
+		Path:	{Application}*lib*Platform
 	Precompile:	
 	Postlink:	
 MainModule

test/Makefile

-CLM:=clm
-override CLMFLAGS+=-I ../lib -IL ArgEnv -IL Platform -IL GraphCopy -ns
-ifneq ($(OS),Mac)
-override CLMFLAGS+=-no-opt-link
-endif
+CPM:=cpm
 
 TESTS:=CodeSharing GraphTest
 RUNTESTS:=$(addprefix test-,$(TESTS))
 
 all: $(TESTS)
 
-CodeSharing: library .FORCE
-	$(CLM) $(CLMFLAGS) $@ -o $@
+$(TESTS): %: %.prj library .FORCE
+	$(CPM) $<
 
-GraphTest: library .FORCE
-	$(CLM) -O -bytecode _system
-	$(CLM) $(CLMFLAGS) -exl -desc -bytecode -optabc -h 10m $@ -o $@
+%.prj: %.prj.default
+	cp $< $@
 
 test: $(RUNTESTS)