Skip to content

Commit

Permalink
fix(rosetta): Compile extensions with clang with Chaos is compiled wi…
Browse files Browse the repository at this point in the history
…th clang
  • Loading branch information
mertyildiran committed Dec 25, 2020
1 parent 15e5444 commit 2a23cf8
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/rosetta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
- name: Run the tests (clang)
run: |
make rosetta-install
make rosetta-install-clang
make rosetta-test
make rosetta-test-compiler
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
- name: Run the tests (clang)
run: |
source ~/.bash_profile
make rosetta-install
make rosetta-install-clang
make rosetta-test
make rosetta-test-compiler
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ help.h

# Chaos build directory
build

# Rosetta spells directory
tests/rosetta/spells
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@ compile-dev:
rosetta-install:
./tests/rosetta/install.sh

rosetta-install-clang:
./tests/rosetta/install.sh clang

rosetta-test:
./tests/rosetta/interpreter.sh

Expand Down
8 changes: 6 additions & 2 deletions tests/rosetta/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ install_spell() {
fi
git clone https://github.com/chaos-lang/$1.git --depth 1 && \
cd $1/ && \
make && \
if [ "$2" == "clang" ]; then
make clang
else
make
fi
cd ..
}

Expand All @@ -20,6 +24,6 @@ cd tests/rosetta/spells && \

for spell in ${SPELL_LIST[*]}
do
install_spell $spell || exit 1
install_spell $spell $1 || exit 1
done

0 comments on commit 2a23cf8

Please sign in to comment.