<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/testsuite/+/14318">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Friendly Automation: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">asttest: allow to compile on fedora31<br><br>On fedora pkg-config uses lua-5.1 instead of lua5.1 so asttest failed to compile.<br><br>Change-Id: I69e7f4607d9e838bb9013ab42580556329fb3f6c<br>---<br>M asttest/Makefile<br>M asttest/tools/lfs.diff<br>M asttest/tools/luaposix.diff<br>M asttest/tools/luasocket.diff<br>4 files changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/asttest/Makefile b/asttest/Makefile</span><br><span>index 9312d62..2bfebdc 100644</span><br><span>--- a/asttest/Makefile</span><br><span>+++ b/asttest/Makefile</span><br><span>@@ -46,11 +46,11 @@</span><br><span> </span><br><span> # Basic set of sources and flags/libraries/includes</span><br><span> OBJS:=asttest.o lib/lua.o lib/testsuite.o lib/testutils.o</span><br><span style="color: hsl(0, 100%, 40%);">-CFLAGS:=-g -D_GNU_SOURCE -Wall `pkg-config --cflags lua5.1 2> /dev/null || pkg-config --cflags lua 2> /dev/null` -Iinclude</span><br><span style="color: hsl(120, 100%, 40%);">+CFLAGS:=-g -D_GNU_SOURCE -Wall `pkg-config --cflags lua5.1 2> /dev/null || pkg-config --cflags lua-5.1 2> /dev/null || pkg-config --cflags lua 2> /dev/null` -Iinclude</span><br><span> L_MODULES:=$(LUAFILESYSTEM_OBJS) $(LUASOCKET_OBJS) $(LUAPOSIX_OBJS) </span><br><span> L_LIBS:=$(LUAPOSIX_LIBS)</span><br><span> L_OBJS:=lib/lua/testlib.o lib/lua/astlib.o lib/lua/proclib.o</span><br><span style="color: hsl(0, 100%, 40%);">-T_LIBS:=`pkg-config --libs lua5.1 2> /dev/null || pkg-config --libs lua 2> /dev/null || echo -llua -lm -ldl`</span><br><span style="color: hsl(120, 100%, 40%);">+T_LIBS:=`pkg-config --libs lua5.1 2> /dev/null || pkg-config --libs lua-5.1 2> /dev/null || pkg-config --libs lua 2> /dev/null || echo -llua -lm -ldl`</span><br><span> </span><br><span> </span><br><span> all: asttest</span><br><span>diff --git a/asttest/tools/lfs.diff b/asttest/tools/lfs.diff</span><br><span>index aad68dd..32457aa 100644</span><br><span>--- a/asttest/tools/lfs.diff</span><br><span>+++ b/asttest/tools/lfs.diff</span><br><span>@@ -6,7 +6,7 @@</span><br><span>  WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic</span><br><span>  INCS= -I$(LUA_INC)</span><br><span> -CFLAGS= $(WARN) $(INCS)</span><br><span style="color: hsl(0, 100%, 40%);">-+LUA_CFLAGS=`pkg-config --cflags lua5.1 2> /dev/null || pkg-config --cflags lua 2> /dev/null`</span><br><span style="color: hsl(120, 100%, 40%);">++LUA_CFLAGS=`pkg-config --cflags lua5.1 2> /dev/null || pkg-config --cflags lua-5.1 2> /dev/null || pkg-config --cflags lua 2> /dev/null`</span><br><span> +CFLAGS= $(WARN) $(LUA_CFLAGS)</span><br><span>  CC= gcc</span><br><span>  </span><br><span>diff --git a/asttest/tools/luaposix.diff b/asttest/tools/luaposix.diff</span><br><span>index 2ff44e3..b6719dd 100644</span><br><span>--- a/asttest/tools/luaposix.diff</span><br><span>+++ b/asttest/tools/luaposix.diff</span><br><span>@@ -82,7 +82,7 @@</span><br><span>  CPPFLAGS= -fPIC $(INCS) $(WARN)</span><br><span>  WARN=         -pedantic -Wall</span><br><span> -INCS=               -I$(LUAINC)</span><br><span style="color: hsl(0, 100%, 40%);">-+INCS=               `pkg-config --cflags lua5.1 2> /dev/null || pkg-config --cflags lua 2> /dev/null`</span><br><span style="color: hsl(120, 100%, 40%);">++INCS=         `pkg-config --cflags lua5.1 2> /dev/null || pkg-config --cflags lua-5.1 2> /dev/null || pkg-config --cflags lua 2> /dev/null`</span><br><span>  </span><br><span>  MYNAME=         posix</span><br><span>  MYLIB=                $(MYNAME)</span><br><span>diff --git a/asttest/tools/luasocket.diff b/asttest/tools/luasocket.diff</span><br><span>index 401236e..dba5891 100644</span><br><span>--- a/asttest/tools/luasocket.diff</span><br><span>+++ b/asttest/tools/luasocket.diff</span><br><span>@@ -13,7 +13,7 @@</span><br><span> -#LUAINC=-I/usr/local/include/lua50</span><br><span> -#LUAINC=-I/usr/local/include/lua5.1</span><br><span> -#LUAINC=-Ilua-5.1.1/src</span><br><span style="color: hsl(0, 100%, 40%);">-+LUAINC=`pkg-config --cflags lua5.1 2> /dev/null || pkg-config --cflags lua 2> /dev/null`</span><br><span style="color: hsl(120, 100%, 40%);">++LUAINC=`pkg-config --cflags lua5.1 2> /dev/null || pkg-config --cflags lua-5.1 2> /dev/null || pkg-config --cflags lua 2> /dev/null`</span><br><span>  </span><br><span>  #------</span><br><span>  # Compat-5.1 directory</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/testsuite/+/14318">change 14318</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/testsuite/+/14318"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: testsuite </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: I69e7f4607d9e838bb9013ab42580556329fb3f6c </div>
<div style="display:none"> Gerrit-Change-Number: 14318 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>