diff --git a/Makefile b/Makefile index 9cfd215..9603372 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ EMACS ?= emacs -LOAD_PATH = -L . -L scripts -L ../etaf -L ../etaf-ui -L ../ebox -L ../ecss -L ../tp -L ../etaf-sqlite +LOAD_PATH = -L . -L scripts -L ../etaf -L ../etaf-ui -L ../ebox -L ../ecss -L ../tp -L ../etaf-db EBOX_NATIVE_RELEASE_DIR = $(shell $(EMACS) -Q --batch $(LOAD_PATH) \ --eval '(setq load-prefer-newer t)' -l ../ebox/ebox-native-reflow.el \ --eval '(princ (expand-file-name (format "../ebox/native/target/%s/release/" (ebox-native-reflow--rust-target))))') @@ -23,7 +23,7 @@ compile: $(MAKE) -C ../ebox compile EMACS="$(EMACS)" ECSS_DIR=../ecss TP_DIR=../tp $(MAKE) -C ../etaf compile EMACS="$(EMACS)" $(MAKE) -C ../etaf-ui compile EMACS="$(EMACS)" - $(MAKE) -C ../etaf-sqlite compile EMACS="$(EMACS)" + $(MAKE) -C ../etaf-db compile EMACS="$(EMACS)" rm -f *.elc scripts/*.elc tests/*.elc $(EXAMPLE_ELC) $(EMACS) -Q --batch $(LOAD_PATH) -L ../etaf/scripts -L ../ebox-playground \ --eval "(setq load-prefer-newer t byte-compile-error-on-warn t byte-compile-warnings '(not obsolete))" \ @@ -80,7 +80,7 @@ perf-regressions: $(MAKE) -C ../ebox test EMACS="$(EMACS)" ECSS_DIR=../ecss TP_DIR=../tp $(MAKE) -C ../etaf test EMACS="$(EMACS)" $(MAKE) -C ../etaf-ui test EMACS="$(EMACS)" - $(MAKE) -C ../etaf-sqlite test EMACS="$(EMACS)" + $(MAKE) -C ../etaf-db test EMACS="$(EMACS)" $(MAKE) test EMACS="$(EMACS)" # Measure absolute latency before the CPU-heavy regression graph. Regressions diff --git a/scripts/run-gui-verification.sh b/scripts/run-gui-verification.sh index c2dff80..99f9dad 100755 --- a/scripts/run-gui-verification.sh +++ b/scripts/run-gui-verification.sh @@ -89,7 +89,7 @@ run_scenario() { --load-path "$REPOS_DIR/ebox" \ --load-path "$REPOS_DIR/etaf" \ --load-path "$REPOS_DIR/etaf-ui" \ - --load-path "$REPOS_DIR/etaf-sqlite" \ + --load-path "$REPOS_DIR/etaf-db" \ --load-path "$REPOS_DIR/ebox-playground" \ --load-path "$REPOS_DIR/ebox-playground/scripts" \ --load-path "$PLAYGROUND_DIR" \ diff --git a/tests/etaf-playground-tests.el b/tests/etaf-playground-tests.el index 72cc79f..c9cc50c 100644 --- a/tests/etaf-playground-tests.el +++ b/tests/etaf-playground-tests.el @@ -316,7 +316,7 @@ frame." "$(MAKE) -C ../ebox compile" "$(MAKE) -C ../etaf compile" "$(MAKE) -C ../etaf-ui compile" - "$(MAKE) -C ../etaf-sqlite compile")) + "$(MAKE) -C ../etaf-db compile")) (should (string-match-p (regexp-quote dependency) makefile))))) (ert-deftest etaf-playground-performance-gate-runs-before-regressions ()