Skip to contentSkip to conversation

fix for file_test for systems without rpm installed

LTP Paul Larson 3 participants 4 messages Aug 19, 2009 – Aug 26, 2009

lore
Share & tools
lore
#0 lore raw

Here's the fixed version, forgot I needed to redo these...

If you run file_test.sh on a system without rpm installed, it should return tconf instead of tfail.

---

testcases/commands/ade/file/file_test.sh +6 -5
index 4fc9dec..4e30d43 100755
@@ -472,6 +472,8 @@ export TCID=file09
 export TST_COUNT=9
 
 $LTPBIN/tst_resm TINFO "TEST #9: file command recognizes RPM files"
+`type rpm &> /dev/null`
+if [ $? = 0 ]; then
 if [ -f /etc/redhat-release ]; then
 	bDIR=/usr/src/redhat
 	bCMD=rpmbuild
@@ -574,6 +576,9 @@ else
     $LTPBIN/tst_resm TFAIL "file: Failed to recognize RPM file"
     TFAILCNT=$(( $TFAILCNT+1 ))
 fi
+else
+    $LTPBIN/tst_resm TCONF "rpm not installed"
+fi
 
 
 # TEST #10
@@ -582,11 +587,7 @@ fi
 export TCID=file10
 export TST_COUNT=10
 
-if [ -f /etc/redhat-release ]; then
-   KERNEL=vmlinuz
-else
-   KERNEL=vmlinux
-fi
+KERNEL=vmlinu
 
 $LTPBIN/tst_resm TINFO "TEST #10: file command recognizes $KERNEL file"
 

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july

_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

#1 lore raw
Quoted 6 lines · Paul Larson

Here's the fixed version, forgot I needed to redo these...

If you run file_test.sh on a system without rpm installed, it should return tconf instead of tfail.

Thanks Paul.

Regards--
Subrata

Quoted 8 lines

---

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

#2 lore raw
In reply to Paul Larson
Quoted 13 lines · Paul Larson

Here's the fixed version, forgot I needed to redo these...

If you run file_test.sh on a system without rpm installed, it should return tconf instead of tfail.

---

index 4fc9dec..4e30d43 100755

testcases/commands/ade/file/file_test.sh +0 -0
@@ -582,11 +587,7 @@ fi
 export TCID=file10

testcases/commands/ade/file/file_test.sh fi · line 592

Quoted 10 lines
testcases/commands/ade/file/file_test.sh +1 -5
 export TST_COUNT=10
 
-if [ -f /etc/redhat-release ]; then
-   KERNEL=vmlinuz
-else
-   KERNEL=vmlinux
-fi
+KERNEL=vmlinu
 
 $LTPBIN/tst_resm TINFO "TEST #10: file command recognizes $KERNEL file"

I guess this change was not supposed to be part of this patch?

Not that I'm complaining, as it fixes another vmlinuz vs. vmlinux mismatch I was seeing ;-)

With kind regards,

Geert Uytterhoeven
Software Architect
Techsoft Centre

Technology and Software Centre Europe
The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium

Phone:    +32 (0)2 700 8453
Fax:      +32 (0)2 700 8622
E-mail:   [email protected]
Internet: http://www.sony-europe.com/

A division of Sony Europe (Belgium) N.V.
VAT BE 0413.825.160 · RPR Brussels
Fortis · BIC GEBABEBB · IBAN BE41293037680010

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

#3 lore raw
Quoted 23 lines · Geert Uytterhoeven
Quoted 22 lines · Paul Larson

Here's the fixed version, forgot I needed to redo these...

If you run file_test.sh on a system without rpm installed, it should return tconf instead of tfail.

---

index 4fc9dec..4e30d43 100755

testcases/commands/ade/file/file_test.sh +1 -5
@@ -582,11 +587,7 @@ fi
 export TCID=file10
 export TST_COUNT=10
 
-if [ -f /etc/redhat-release ]; then
-   KERNEL=vmlinuz
-else
-   KERNEL=vmlinux
-fi
+KERNEL=vmlinu
 
Quoted 6 lines

testcases/commands/ade/file/file_test.sh fi · line 592

Quoted 1 line
testcases/commands/ade/file/file_test.sh +0 -0
 $LTPBIN/tst_resm TINFO "TEST #10: file command recognizes $KERNEL file"

I guess this change was not supposed to be part of this patch?

Not that I'm complaining, as it fixes another vmlinuz vs. vmlinux mismatch I was seeing ;-)

Ha, yeah I just forgot to mention it too. And that was exactly the reason for it.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list