Merge branch 'master' into thanos_support

.gitignore

 build
 .sconsign.dblite
+*.o

.gitlab-ci.yml

 before_script:
-  - pwd
-  - cp -R ./* /home/gitlab-runner/code/peasoup_umbrella/zipr/
-  - cd /home/gitlab-runner/code/peasoup_umbrella
-  - source set_env_vars
+  - "source ~gitlab-runner/cicd_support/cicd_support.shinc" 
+
+
 after_script:
-  - "rm -rf /home/gitlab-runner/code/peasoup_umbrella/zipr/* || true"
+  - "echo Test Complete."
+
+stages:
+  - clean
+  - build
+  - test
+
+
+
+#
+# Cleaning
+#
+
+#template 
+.do-clean: &do-nightly-clean
+  stage: clean
+  script:
+    - ./cicd_tests/do-clean.sh
+
+# per os items
+do-nightly-clean-ubuntu18:
+  <<: *do-nightly-clean
+  tags:
+    - ubuntu18
+  variables:
+    OS: 'ubuntu18'  
+
+do-nightly-clean-ubuntu16:
+  <<: *do-nightly-clean
+  tags:
+    - ubuntu16
+  variables:
+    OS: 'ubuntu16'  
+
+do-nightly-clean-centos75:
+  <<: *do-nightly-clean
+  tags:
+    - centos75
+  variables:
+    OS: 'centos75'  
+
+
+#
+# building 
+#
+
+
+# template
+.do-build: &do-build
+  stage: build
+  script:
+    - ./cicd_tests/do-build.sh
+
+
+# per os items
+do-build-ubuntu18:
+  <<: *do-build
+  tags:
+    - ubuntu18
+  variables:
+    OS: 'ubuntu18'  
+
+
+do-build-ubuntu16:
+  <<: *do-build
+  tags:
+    - ubuntu16
+  variables:
+    OS: 'ubuntu16'  
+
+do-build-centos75:
+  <<: *do-build
+  tags:
+    - centos75
+  variables:
+    OS: 'centos75'  
+
+
+
+#
+# $PSZ ls
+#
+
+# template
+.xform-ls: &xform-ls
+  stage: test
+  script:
+    - ./cicd_tests/xform-ls.sh
+
+#per OS
+xform-ls-ubuntu18:
+  <<: *xform-ls
+  tags:
+    - ubuntu18
+  variables:
+    OS: 'ubuntu18'  
+
+xform-ls-ubuntu16:
+  <<: *xform-ls
+  tags:
+    - ubuntu16
+  variables:
+    OS: 'ubuntu16'  
+
+xform-ls-centos75:
+  <<: *xform-ls
+  tags:
+    - centos75
+  variables:
+    OS: 'centos75'  
+
+#
+# $PSZ cat
+#
 
-testing:
+# template
+.xform-cat: &xform-cat
+  stage: test
+  script:
+    - ./cicd_tests/xform-cat.sh
+
+xform-cat-ubuntu18:
+  <<: *xform-cat
   tags:
-    - zipr
+    - ubuntu18
+  variables:
+    OS: 'ubuntu18'  
+    
+xform-cat-ubuntu16:
+  <<: *xform-cat
+  tags:
+    - ubuntu16
+  variables:
+    OS: 'ubuntu16'  
+
+xform-cat-centos75:
+  <<: *xform-cat
+  tags:
+    - centos75
+  variables:
+    OS: 'centos75'  
+
+#
+# run zipr internal tests
+#
+
+# template
+.internal-tests: &internal-tests
+  stage: test
   script:
-    - pwd
-    - hostname
-    - whoami
-    - cd zipr
-    - ls
-    - scons -c
-    - scons debug=1
+    - ./cicd_tests/internal-tests.sh
+
+#per OS
+internal-tests-ubuntu18:
+  <<: *internal-tests
+  tags:
+    - ubuntu18
+  variables:
+    OS: 'ubuntu18'  
+
+internal-tests-ubuntu16:
+  <<: *internal-tests
+  tags:
+    - ubuntu16
+  variables:
+    OS: 'ubuntu16'  
+
+internal-tests-centos75:
+  <<: *internal-tests
+  tags:
+    - centos75
+  variables:
+    OS: 'centos75'  

cicd_tests/do-build.sh

+#/bin/bash 
+
+set -e
+set -x
+
+main()
+{
+
+	# gather info for debugging later, probably not necessary 
+	pwd
+	hostname
+	whoami
+	env|grep "^CICD"
+
+	local orig_dir=$(pwd)
+
+	# puts peasoup_umbrella (and all submodules) in CICD_MODULE_WORK_DIR
+	cicd_setup_module_dependency allnp/peasoup_umbrella.git
+
+
+	# puts the version of zipr to test in peasoup_umbrella/zipr.
+	cicd_put_module_in_tree peasoup_umbrella/zipr
+
+	# Build/run $PSZ, test result
+	cd $CICD_MODULE_WORK_DIR/peasoup_umbrella
+	source set_env_vars
+	sudo ./get-peasoup-packages.sh all
+	./build-all.sh
+	dropdb $PGDATABASE 2>/dev/null || true ; ./postgres_setup.sh
+
+	cd $orig_dir
+}
+
+main "$@"

cicd_tests/do-clean.sh

+#/bin/bash 
+
+set -e
+set -x
+
+main()
+{
+
+	# gather info for debugging later, probably not necessary 
+	pwd
+	hostname
+	whoami
+	env|grep "^CICD"
+
+
+	if [[ $CICD_NIGHTLY == 1 ]] ; then
+		rm -rf $CICD_MODULE_WORK_DIR/peasoup_umbrella
+	fi
+
+}
+
+main "$@"

cicd_tests/internal-tests.sh

+#!/bin/bash 
+
+set -e
+set -x
+
+cd $CICD_MODULE_WORK_DIR/peasoup_umbrella
+source set_env_vars
+# run zipr internal tests
+cd $ZIPR_HOME/test; scons
+for i in *.exe; do ./$i; done
+
+

cicd_tests/xform-cat.sh

+cd $CICD_MODULE_WORK_DIR/peasoup_umbrella
+
+set -e
+set -x
+
+source set_env_vars
+cd /tmp
+rm -rf cat.rida ped_cat; $PSZ $(which cat) ./cat.rida -c rida=on -s meds_static=off --tempdir ped_cat || true
+if [[ ! -x ./cat.rida ]]; then cat ped_ls/logs/*; fi
+./cat.rida /dev/null 

cicd_tests/xform-ls.sh

+#!/bin/bash
+set -e
+set -x
+
+cd $CICD_MODULE_WORK_DIR/peasoup_umbrella
+source set_env_vars
+cd /tmp
+rm -rf ls.rida ped_ls; $PSZ /bin/ls ./ls.rida -c rida=on -s meds_static=off --tempdir ped_ls || true
+if [[ ! -x ./ls.rida ]]; then cat ped_ls/logs/*; fi
+rm -rf ped_ls
+./ls.rida

test/ZiprRange.cpp

@@ -61,18 +61,17 @@ bool TestRangeSpeed() {
 	}
 
 	//m.PrintMemorySpace(cout);
-
-	for (int i = 0;
-	     i<100000000;
-			 i++)
+	const auto timeStart=clock();	
+	auto i=0;
+	for (i = 0; (clock()-timeStart)/CLOCKS_PER_SEC < 10; i++)
 	{
 		volatile RangeAddress_t found_start = 0;
-		Range_t placement;
-		placement = m.GetFreeRange(d->Size());
+		auto placement = m.GetFreeRange(d->Size());
 
 		found_start = placement.GetStart();
 		found_start++;
 	}
+	cout<<"In 10 seconds, executed "<<dec<<i<<" iterations of GetFreeRange()"<<endl;
 
 	return true;
 }