compatibility fixes

Makefile

@@ -40,6 +40,8 @@ LDFLAGS_RTS := -L ${mkfile_dir}/lib -lrts
 LDFLAGS_RTS_DBG := -L ${mkfile_dir}/lib -lrts_dbg -g
 LUNA_HOME ?= ${mkfile_dir}
 
+PYTHON ?= python3
+
 LD_LIBRARY_PATH ?= ${mkfile_dir}/lib
 export LD_LIBRARY_PATH
 
@@ -48,10 +50,13 @@ export LD_LIBRARY_PATH
 default: build_all
 
 test: build_all
-	LUNA_HOME=${LUNA_HOME} scripts/run_tests.py tests
+	LUNA_HOME=${LUNA_HOME} ${PYTHON} scripts/run_tests.py tests
 
 fftest: build_all
-	LUNA_HOME=${LUNA_HOME} scripts/run_tests.py --first-fail tests
+	LUNA_HOME=${LUNA_HOME} ${PYTHON} scripts/run_tests.py --first-fail tests
+
+test04:
+	LUNA_HOME=${LUNA_HOME} ${PYTHON} scripts/run_tests.py --first-fail tests/04_programs
 
 .PHONY: build_all
 build_all: bin/rts bin/rts.dbg bin/parser bin/luna

scripts/common.py

-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 class FatalError(Exception):
 	def __init__(self, message, *args, **kwargs):

scripts/explore_log_cfs.py

-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 # The program reads the joint log file obtained from lo3 and writes two files:
 # *.cfs.done   - list of CFs (and thair correcponding events), which finished their execution on a given node

scripts/explore_log_dfs.py

-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 # The program reads the joint log file obtained from lo3 and writes two files:
 # *.dfs.resp   - list of DFs (and thair correcponding events), which were "responded" on each "requested"

scripts/fcmp

-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 # COMPILATION OPTIONS
 

scripts/fcmp2

-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 DEFAULT_LOCATOR_0=True # Set locator 0 if unset
 ADD_DEBUG_INFO=False

scripts/luna

-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 # TODO add ability to use some other temporary directory for building
 # tests, not .luna subdirectory, and allow setup via environment var.

scripts/mkgen

-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 import subprocess, os, sys
 

scripts/pp.py

-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 import sys, os, re, json
 import common

scripts/repr_ja.py

-#/usr/bin/python3
+#!/usr/bin/env python3
 
 import json
 

scripts/run_tests.py

-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 import sys, os, subprocess, re, time
 

src/rts/common.cpp

@@ -14,14 +14,14 @@ std::string _prefix = {0};
 
 void wtime_init()
 {
-	clock_gettime(CLOCK_MONOTONIC_RAW, &t_);
+	clock_gettime(CLOCK_MONOTONIC, &t_);
 	clock_gettime(CLOCK_THREAD_CPUTIME_ID, &tt_);
 }
 
 double wtime()
 {
 	struct timespec t;
-	clock_gettime(CLOCK_MONOTONIC_RAW, &t);
+	clock_gettime(CLOCK_MONOTONIC, &t);
 	return t.tv_sec-t_.tv_sec+0.000000001*(t.tv_nsec-t_.tv_nsec);
 }
 

tests/02_preproc/01_trivial/conf

-RUN=python $LUNA_HOME/scripts/pp.py input -o output
+RUN=python3 $LUNA_HOME/scripts/pp.py input -o output
 RETCODE=0
 STDOUT_EMPTY
 STDERR_EMPTY

tests/02_preproc/02_unmatched_quote/conf

-RUN=python $LUNA_HOME/scripts/pp.py input
+RUN=python3 $LUNA_HOME/scripts/pp.py input
 RETCODE=1
 STDOUT_EMPTY
 STDERR_MATCH=preprocessing error:.*input:2:23:$

tests/02_preproc/03_unfinished_block/conf

-RUN=python $LUNA_HOME/scripts/pp.py input
+RUN=python3 $LUNA_HOME/scripts/pp.py input
 RETCODE=1
 STDOUT_EMPTY
 STDERR_MATCH=preprocessing error:.*end of file.*input:2:14:$

tests/02_preproc/04_blocks_anarchy/conf

-RUN=python $LUNA_HOME/scripts/pp.py input
+RUN=python3 $LUNA_HOME/scripts/pp.py input
 RETCODE=0
 STDOUT_EMPTY
 STDERR_EMPTY

tests/02_preproc/05_block_in_string/conf

-RUN=python $LUNA_HOME/scripts/pp.py input
+RUN=python3 $LUNA_HOME/scripts/pp.py input
 RETCODE=0
 STDOUT_EMPTY
 STDERR_EMPTY

tests/02_preproc/06_single_line_comments/conf

-RUN=python $LUNA_HOME/scripts/pp.py input -o got_output
+RUN=python3 $LUNA_HOME/scripts/pp.py input -o got_output
 RETCODE=0
 STDOUT_EMPTY
 STDERR_EMPTY

tests/02_preproc/07_multiline_comments/conf

-RUN=python $LUNA_HOME/scripts/pp.py input
+RUN=python3 $LUNA_HOME/scripts/pp.py input
 RETCODE=0
 STDOUT_EMPTY
 STDERR_EMPTY

tests/02_preproc/08_unclosed_comment/conf

-RUN=python $LUNA_HOME/scripts/pp.py input
+RUN=python3 $LUNA_HOME/scripts/pp.py input
 RETCODE=1
 STDOUT_EMPTY
 STDERR_MATCH=preprocessing error:.*end of file.*input:1:11:$