diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2020-04-22 10:19:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-22 10:19:30 -0700 |
| commit | db27f2f3786fa867bf7524aff6a5b72c89932620 (patch) | |
| tree | 976703d8b77991efed88988e9fda5b9b0bd54fda | |
| parent | 28623f19eebf4abe7d956087f681a988f8733f95 (diff) | |
| parent | 4f847cb64aa144977172f88ec9b2b91299d68827 (diff) | |
| download | yosys-db27f2f3786fa867bf7524aff6a5b72c89932620.tar.gz yosys-db27f2f3786fa867bf7524aff6a5b72c89932620.tar.bz2 yosys-db27f2f3786fa867bf7524aff6a5b72c89932620.zip | |
Merge pull request #1973 from YosysHQ/eddie/fix1966
tests: fix various/plugin.sh when PREFIX != /usr/local/share
| -rw-r--r-- | misc/yosys-config.in | 2 | ||||
| -rw-r--r-- | tests/various/plugin.sh | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/misc/yosys-config.in b/misc/yosys-config.in index 370835f8f..a31ef38c2 100644 --- a/misc/yosys-config.in +++ b/misc/yosys-config.in @@ -6,7 +6,7 @@ help() { echo "Usage: $0 [--exec] [--prefix pf] args.." echo " $0 --build modname.so cppsources.." echo "" - echo "Replecement args:" + echo "Replacement args:" echo " --cxx @CXX@" echo " --cxxflags $( echo '@CXXFLAGS@' | fmt -w60 | sed ':a;N;$!ba;s/\n/ \\\n /g' )" echo " --ldflags @LDFLAGS@" diff --git a/tests/various/plugin.sh b/tests/various/plugin.sh index d6d4aee59..2880c8c06 100644 --- a/tests/various/plugin.sh +++ b/tests/various/plugin.sh @@ -1,6 +1,8 @@ set -e rm -f plugin.so CXXFLAGS=$(../../yosys-config --cxxflags) -CXXFLAGS=${CXXFLAGS// -I\/usr\/local\/share\/yosys\/include/ -I..\/..\/share\/include} +DATDIR=$(../../yosys-config --datdir) +DATDIR=${DATDIR//\//\\\/} +CXXFLAGS=${CXXFLAGS//$DATDIR/..\/..\/share} ../../yosys-config --exec --cxx ${CXXFLAGS} --ldflags -shared -o plugin.so plugin.cc ../../yosys -m ./plugin.so -p "test" | grep -q "Plugin test passed!" |